Issue #438 - Upgrade Docker Image - Ubuntu Jammy - Python 3.10 fixes #452

#452 fixed

#438 upgrade Dockerfile to Ubuntu Jammy - Python 3.10

#438 refine requirements

Author: justb4

Dockerfile

@@ -1,7 +1,4 @@
-FROM python:3.7-alpine 
-
-# Thanks to http://www.sandtable.com/reduce-docker-image-sizes-using-alpine
-# FROM debian:jessie
+FROM ubuntu:jammy
 
 # Credits to yjacolin for providing first versions
 LABEL original_developer="yjacolin <[email protected]>" \
@@ -10,12 +7,19 @@ LABEL original_developer="yjacolin <[email protected]>" \
 # These are default values,
 # Override when running container via docker(-compose)
 
+# ARGS
+ARG TZ="Etc/UTC"
+ARG LANG="en_US.UTF-8"
+ARG ADD_DEB_PACKAGES=""
+
 # General ENV settings
 ENV LC_ALL="en_US.UTF-8" \
 	LANG="en_US.UTF-8" \
 	LANGUAGE="en_US.UTF-8" \
     \
 	\
+	DEB_PACKAGES="locales gunicorn python3-gunicorn python3-gevent python3-psycopg2 python3-lxml python3-pyproj" \
+	DEB_BUILD_DEPS="make python3-pip" \
 	# GHC ENV settings\
 	ADMIN_NAME=admin \
 	ADMIN_PWD=admin \
@@ -57,7 +61,7 @@ HOST=0.0.0.0 \
 PORT=80 \
 WSGI_WORKERS=4 \
 WSGI_WORKER_TIMEOUT=6000 \
-WSGI_WORKER_CLASS='eventlet' \
+WSGI_WORKER_CLASS='gevent' \
 \
 # GHC Core Plugins modules and/or classes, seldom needed to set:  \
 # if not specified here or in Container environment  \
@@ -69,9 +73,12 @@ WSGI_WORKER_CLASS='eventlet' \
 # GHC User Plugins, best be overridden via Container environment \
 GHC_USER_PLUGINS=''
 
-RUN apk add --no-cache --virtual .build-deps gcc build-base libxslt-dev libxml2-dev linux-headers postgresql-dev \
-    && apk add --no-cache bash postgresql-client libxslt libxml2 tzdata openntpd proj-dev proj-util \
-    && rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
+# Install operating system dependencies
+RUN \
+    apt-get update \
+    && apt-get --no-install-recommends install -y ${DEB_PACKAGES} ${DEB_BUILD_DEPS} ${ADD_DEB_PACKAGES} \
+    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
+    && echo "For ${TZ} date=$(date)" && echo "Locale=$(locale)"
 
 # Add standard files and Add/override Plugins
 # Alternative Entrypoints to run GHC jobs
@@ -81,8 +88,15 @@ COPY docker/scripts/*.sh docker/config_site.py docker/plugins /
 # Add Source Code
 COPY . /GeoHealthCheck
 
-# Install and Remove build-related packages for smaller image size
-RUN chmod a+x /*.sh && bash install.sh && apk del .build-deps
+# Install
+RUN \
+	chmod a+x /*.sh && ./install.sh \
+    # Cleanup TODO: remove unused Locales and TZs
+    && apt-get remove --purge -y ${DEB_BUILD_DEPS} \
+    && apt-get clean \
+    && apt autoremove -y  \
+    && rm -rf /var/lib/apt/lists/*
+
 
 # For SQLite
 VOLUME ["/GeoHealthCheck/DB/"]

docker/scripts/configure.sh

@@ -3,8 +3,6 @@
 
 echo "START /configure.sh"
 
-source /venv/bin/activate .
-
 # Make sure PYTHONPATH includes GeoHealthCheck
 export PYTHONPATH=/GeoHealthCheck/GeoHealthCheck:$PYTHONPATH
 
@@ -14,9 +12,9 @@ echo "Using DB_TYPE=${DB_TYPE}"
 
 # Create DB shorthand
 function create_db() {
-	pushd /GeoHealthCheck/
+	pushd /GeoHealthCheck/  || exit 1
 	paver create -u ${ADMIN_NAME} -p ${ADMIN_PWD} -e ${ADMIN_EMAIL}
-	popd
+	popd || exit 1
 }
 
 # Init actions per DB type

docker/scripts/cron-jobs-daily.sh

@@ -1,5 +1,4 @@
-# /bin/bash
+#!/bin/bash
 
-source /venv/bin/activate .
-python /GeoHealthCheck/GeoHealthCheck/models.py flush
+python3 /GeoHealthCheck/GeoHealthCheck/models.py flush
 

docker/scripts/cron-jobs-hourly.sh

@@ -1,6 +1,5 @@
-# /bin/bash
+#!/bin/bash
 
-source /venv/bin/activate .
 
 # Copy possible mounted Plugins into app tree
 if [ -d /plugins ]

docker/scripts/install.sh

@@ -1,17 +1,14 @@
 #!/bin/bash
 
-cd /
-python3 -m venv venv
-source /venv/bin/activate
-
 # GHC Source was added in Dockerfile, install
 # NB we use gunicorn/eventlet async workers as some Probes may take a long time
 # e.g. fetching Metadata (Caps) and testing all layers
 # Install Python packages for installation and setup
-pip install --upgrade pip
-pip install -I -r /GeoHealthCheck/docker/scripts/requirements.txt
 
-cd /GeoHealthCheck
+pushd /GeoHealthCheck || exit 1
+
+# Docker-specific deps
+pip install -r docker/scripts/requirements.txt
 
 # Sets up GHC itself
 paver setup
@@ -27,3 +24,5 @@ then
 	# Remove to allow later Volume mount of /plugins
 	rm -rf /plugins
 fi
+
+popd || exit 1

docker/scripts/requirements.txt

@@ -1,6 +1 @@
 Paver==1.3.4
-psycopg2==2.9.2
-eventlet==0.30.2
-gunicorn==20.1.0
-Werkzeug==0.16.1
-tzlocal<3.0

docker/scripts/run-runner.sh

@@ -3,15 +3,11 @@
 echo "START /run-runner.sh"
 
 # Set the timezone.
-/set-timezone.sh
+# /set-timezone.sh
 
 # Configure: DB and plugins.
 /configure.sh
 
-# Run the GHC daemon process
-# that schedules healthcheck jobs
-source /venv/bin/activate .
-
 # Make sure PYTHONPATH includes GeoHealthCheck
 export PYTHONPATH=/GeoHealthCheck/GeoHealthCheck:$PYTHONPATH
 

docker/scripts/run-tests.sh

@@ -8,15 +8,11 @@
 echo "START /run-tests.sh"
 
 # Set the timezone.
-/set-timezone.sh
+# /set-timezone.sh
 
 # Configure: DB and plugins.
 /configure.sh
 
-# Run the GHC daemon process
-# that schedules healthcheck jobs
-source /venv/bin/activate .
-
 # Make sure PYTHONPATH includes GeoHealthCheck
 export PYTHONPATH=/GeoHealthCheck/GeoHealthCheck:$PYTHONPATH
 

docker/scripts/run-web.sh

@@ -5,12 +5,11 @@
 echo "START /run-web.sh"
 
 # Set the timezone.
-/set-timezone.sh
+# /set-timezone.sh
 
 # Configure: DB and plugins.
 /configure.sh
 
-source /venv/bin/activate .
 # Make sure PYTHONPATH includes GeoHealthCheck
 export PYTHONPATH=/GeoHealthCheck/GeoHealthCheck:$PYTHONPATH
 

pavement.py

@@ -179,7 +179,7 @@ def create(options):
 
     if all([username, password, email]):
         args = '%s %s %s' % (username, password, email)
-    sh('python %s create %s' % (path('GeoHealthCheck/models.py'), args))
+    sh('python3 %s create %s' % (path('GeoHealthCheck/models.py'), args))
 
 
 @task
@@ -206,7 +206,7 @@ def upgrade():
 
     info('Upgrading database...')
     with pushd(path('%s/GeoHealthCheck' % BASEDIR)):
-        sh('python manage.py db upgrade')
+        sh('python3 manage.py db upgrade')
 
 
 @task
@@ -302,13 +302,13 @@ def update_translations():
 @task
 def runner_daemon():
     """Run the HealthCheck runner daemon scheduler"""
-    sh('python %s' % path('GeoHealthCheck/scheduler.py'))
+    sh('python3 %s' % path('GeoHealthCheck/scheduler.py'))
 
 
 @task
 def run_healthchecks():
     """Run all HealthChecks directly"""
-    sh('python %s' % path('GeoHealthCheck/healthcheck.py'))
+    sh('python3 %s' % path('GeoHealthCheck/healthcheck.py'))
 
 
 def sphinx_make():
@@ -322,4 +322,4 @@ def sphinx_make():
 @task
 def run_tests():
     """Run all tests"""
-    sh('python %s' % path('tests/run_tests.py'))
+    sh('python3 %s' % path('tests/run_tests.py'))

requirements.txt

@@ -1,4 +1,4 @@
-Jinja2==2.11.3
+Jinja2==3.0.3
 markupsafe==2.0.1
 Flask==1.1.1
 Flask-Babel==0.12.2
@@ -8,13 +8,13 @@ Flask-Script==2.0.6
 SQLAlchemy==1.3.8
 Flask-SQLAlchemy==2.4.0
 itsdangerous==1.1.0
-pyproj==2.6.1.post1
-lxml==4.9.1
+pyproj >=2.6.1
+lxml >= 4.8.0, <= 4.9.2
 OWSLib==0.20.0
 jsonschema==3.0.2 # downgrade from 3.2.0 on sept 29, 2020, issue 331, consider better fix
 openapi-spec-validator==0.2.8
-Sphinx==4.1.1
-sphinx-rtd-theme==0.5.2
+Sphinx==5.3.0
+sphinx-rtd-theme==1.2.2
 requests>=2.23.0
 WTForms==2.2.1
 APScheduler==3.6.1