#496 first stab upgrading Dockerfile to Ubuntu 24.04 - need venv

Author: justb4

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 
 # Credits to yjacolin for providing first versions
 LABEL original_developer="yjacolin <yves.jacolin@camptocamp.com>" \
@@ -18,7 +18,7 @@ ENV LC_ALL="en_US.UTF-8" \
 	LANGUAGE="en_US.UTF-8" \
     \
 	\
-	DEB_PACKAGES="locales gunicorn postgresql-client python3-gunicorn python3-gevent python3-psycopg2 python3-lxml python3-pyproj" \
+	DEB_PACKAGES="locales gunicorn python3.12-venv postgresql-client python3-gunicorn python3-gevent python3-psycopg2 python3-lxml python3-pyproj" \
 	DEB_BUILD_DEPS="make python3-pip" \
 	# GHC ENV settings\
 	ADMIN_NAME=admin \

GeoHealthCheck/migrations/versions/2638c2a40625_.py

@@ -7,8 +7,6 @@
 """
 from alembic import op
 import sqlalchemy as sa
-import imp
-import os
 from GeoHealthCheck.migrations import alembic_helpers
 
 # revision identifiers, used by Alembic.

GeoHealthCheck/migrations/versions/496427d03f87_.py

@@ -7,8 +7,6 @@
 """
 from alembic import op
 import sqlalchemy as sa
-import imp
-import os
 from GeoHealthCheck.migrations import alembic_helpers
 
 # revision identifiers, used by Alembic.

GeoHealthCheck/migrations/versions/992013af402f_.py

@@ -7,8 +7,6 @@
 """
 from alembic import op
 import sqlalchemy as sa
-import imp
-import os
 from GeoHealthCheck.migrations import alembic_helpers
 
 # revision identifiers, used by Alembic.

docker/scripts/configure.sh

@@ -13,6 +13,8 @@ echo "Using DB_TYPE=${DB_TYPE}"
 # Create DB shorthand
 function create_db() {
 	pushd /GeoHealthCheck/  || exit 1
+	source bin/activate
+
 	paver create -u ${ADMIN_NAME} -p ${ADMIN_PWD} -e ${ADMIN_EMAIL}
 	popd || exit 1
 }

docker/scripts/install.sh

@@ -5,10 +5,14 @@
 # e.g. fetching Metadata (Caps) and testing all layers
 # Install Python packages for installation and setup
 
+python3 -m venv GeoHealthCheck
 pushd /GeoHealthCheck || exit 1
 
+source bin/activate
+
+
 # Docker-specific deps
-pip install -r docker/scripts/requirements.txt
+pip install --no-cache-dir -r docker/scripts/requirements.txt
 
 # Sets up GHC itself
 paver setup

docker/scripts/run-runner.sh

@@ -12,6 +12,7 @@ echo "START /run-runner.sh"
 export PYTHONPATH=/GeoHealthCheck/GeoHealthCheck:$PYTHONPATH
 
 cd /GeoHealthCheck
+source bin/activate
 paver runner_daemon
 
 echo "END /run-runner.sh"

docker/scripts/run-tests.sh

@@ -17,6 +17,7 @@ echo "START /run-tests.sh"
 export PYTHONPATH=/GeoHealthCheck/GeoHealthCheck:$PYTHONPATH
 
 cd /GeoHealthCheck
+source bin/activate
 paver run_tests
 
 echo "END /run-tests.sh"

docker/scripts/run-web.sh

@@ -13,15 +13,17 @@ echo "START /run-web.sh"
 # Make sure PYTHONPATH includes GeoHealthCheck
 export PYTHONPATH=/GeoHealthCheck/GeoHealthCheck:$PYTHONPATH
 
-cd /GeoHealthCheck
+pushd /GeoHealthCheck || exit 1
+
+source bin/activate
 
 paver upgrade
 
 # SCRIPT_NAME should not have value '/'
 [ "${SCRIPT_NAME}" = '/' ] && export SCRIPT_NAME="" && echo "make SCRIPT_NAME empty from /"
 
 echo "Running GHC WSGI on ${HOST}:${PORT} with ${WSGI_WORKERS} workers and SCRIPT_NAME=${SCRIPT_NAME}"
-exec gunicorn --workers ${WSGI_WORKERS} \
+exec gunicorn --pythonpath /GeoHealthCheck/lib/python3.12/site-packages/ --workers ${WSGI_WORKERS} \
 		--worker-class=${WSGI_WORKER_CLASS} \
 		--timeout ${WSGI_WORKER_TIMEOUT} \
 		--name="Gunicorn_GHC" \