From 3514ad6b40c13609a96f456c5a3807c224d9b18e Mon Sep 17 00:00:00 2001
From: Olivier Desenfans <desenfans.olivier@gmail.com>
Date: Thu, 28 Sep 2023 11:11:56 +0200
Subject: [PATCH] Fix: install FastAPI from PyPI in Debian 12 runtime

Problem: Debian 12 runtime has FastAPI 0.92.0 (installed from apt) while
Debian 11 runtime has FastAPI 0.95.1. Some VMs previously running on the
Debian 11 runtime do not run on the Debian 12 runtime because of this
issue.

Solution: install the latest version of FastAPI from PyPI.
---
 runtimes/aleph-debian-11-python/create_disk_image.sh | 3 ---
 runtimes/aleph-debian-12-python/create_disk_image.sh | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/runtimes/aleph-debian-11-python/create_disk_image.sh b/runtimes/aleph-debian-11-python/create_disk_image.sh
index 65f33d7c0..e04c8003c 100755
--- a/runtimes/aleph-debian-11-python/create_disk_image.sh
+++ b/runtimes/aleph-debian-11-python/create_disk_image.sh
@@ -17,18 +17,15 @@ apt-get install -y --no-install-recommends --no-install-suggests \
   python3-minimal \
   openssh-server \
   socat libsecp256k1-0 \
-  \
   python3-aiohttp python3-msgpack \
   python3-setuptools \
   python3-pip python3-cytoolz python3-pydantic \
   iproute2 unzip \
   nodejs npm \
   build-essential python3-dev \
-  \
   docker.io \
   cgroupfs-mount \
   nftables \
-  \
   iputils-ping curl
 
 pip3 install 'fastapi~=0.95.1'
diff --git a/runtimes/aleph-debian-12-python/create_disk_image.sh b/runtimes/aleph-debian-12-python/create_disk_image.sh
index 1d969f69c..44006b9e9 100755
--- a/runtimes/aleph-debian-12-python/create_disk_image.sh
+++ b/runtimes/aleph-debian-12-python/create_disk_image.sh
@@ -17,7 +17,6 @@ apt-get install -y --no-install-recommends --no-install-suggests \
   python3-minimal \
   openssh-server \
   socat libsecp256k1-1 \
-  \
   python3-aiohttp python3-msgpack \
   python3-setuptools python3-venv \
   python3-pip python3-cytoolz python3-pydantic \
@@ -25,13 +24,13 @@ apt-get install -y --no-install-recommends --no-install-suggests \
   nodejs npm \
   build-essential python3-dev \
   python3-fastapi \
-  \
   docker.io \
   cgroupfs-mount \
   nftables \
-  \
   iputils-ping curl
 
+pip3 install --break-system-packages 'fastapi~=0.103.1'
+
 echo "Pip installing aleph-sdk-python"
 mkdir -p /opt/aleph/libs
 pip3 install --target /opt/aleph/libs 'aleph-sdk-python==0.7.0'