Dockerfile cleanup and compose creation

Also includes adding requirements for lsp to make autocompletion easier.

Author: Henry Walshaw

Dockerfile

@@ -1,8 +1,8 @@
-FROM ubuntu:jammy
+FROM ubuntu:jammy AS base
 
 # Credits to yjacolin for providing first versions
 LABEL original_developer="yjacolin <[email protected]>" \
-	maintainer="Just van den Broecke <[email protected]>"
+    maintainer="Just van den Broecke <[email protected]>"
 
 # These are default values,
 # Override when running container via docker(-compose)
@@ -13,65 +13,67 @@ 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 postgresql-client 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 \
-	[email protected] \
-	SQLALCHEMY_DATABASE_URI='sqlite:////GeoHealthCheck/DB/data.db' \
-	SQLALCHEMY_ENGINE_OPTION_PRE_PING=False \
-	SECRET_KEY='d544ccc37dc3ad214c09b1b7faaa64c60351d5c8bb48b342' \
-	GHC_PROBE_HTTP_TIMEOUT_SECS=30 \
-	GHC_MINIMAL_RUN_FREQUENCY_MINS=10 \
-	GHC_RETENTION_DAYS=30 \
-	GHC_SELF_REGISTER=False \
-	GHC_NOTIFICATIONS=False \
-	GHC_NOTIFICATIONS_VERBOSITY=True \
-	GHC_WWW_LINK_EXCEPTION_CHECK=False \
-	GHC_LARGE_XML=False \
-	GHC_ADMIN_EMAIL='[email protected]' \
-	GHC_RUNNER_IN_WEBAPP=False \
-	GHC_REQUIRE_WEBAPP_AUTH=False \
-	GHC_BASIC_AUTH_DISABLED=False \
-	GHC_VERIFY_SSL=True \
-	GHC_LOG_LEVEL=30 \
-	GHC_LOG_FORMAT='%(asctime)s - %(name)s - %(levelname)s - %(message)s' \
-	GHC_NOTIFICATIONS_EMAIL='[email protected],[email protected]' \
-	GHC_SITE_TITLE='GeoHealthCheck' \
-	GHC_SITE_URL='http://localhost' \
-	GHC_SMTP_SERVER=None \
-	GHC_SMTP_PORT=None \
-	GHC_SMTP_TLS=False \
-	GHC_SMTP_SSL=False \
-	GHC_SMTP_USERNAME=None \
-	GHC_SMTP_PASSWORD=None \
-	GHC_GEOIP_URL='http://ip-api.com/json/{hostname}' \
-	GHC_GEOIP_LATFIELD='lat' \
-	GHC_GEOIP_LONFIELD='lon' \
-	GHC_METADATA_CACHE_SECS=900 \
-    \
-# WSGI server settings, assumed is gunicorn  \
-HOST=0.0.0.0 \
-PORT=80 \
-WSGI_WORKERS=4 \
-WSGI_WORKER_TIMEOUT=6000 \
-WSGI_WORKER_CLASS='gevent' \
-\
-# GHC Core Plugins modules and/or classes, seldom needed to set:  \
-# if not specified here or in Container environment  \
-# all GHC built-in Plugins will be active.  \
-#ENV GHC_PLUGINS 'GeoHealthCheck.plugins.probe.owsgetcaps,\
-#        GeoHealthCheck.plugins.probe.wms, ...., ...\
-#        GeoHealthCheck.plugins.check.checks' \
-\
-# GHC User Plugins, best be overridden via Container environment \
-GHC_USER_PLUGINS=''
+ENV \
+    LC_ALL="en_US.UTF-8" \
+    LANG="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_BUILD_DEPS="make python3-pip"
+
+# GHC ENV settings
+ENV \
+    [email protected] \
+    ADMIN_NAME=admin \
+    ADMIN_PWD=admin \
+    GHC_ADMIN_EMAIL='[email protected]' \
+    GHC_BASIC_AUTH_DISABLED=False \
+    GHC_GEOIP_LATFIELD='lat' \
+    GHC_GEOIP_LONFIELD='lon' \
+    GHC_GEOIP_URL='http://ip-api.com/json/{hostname}' \
+    GHC_LARGE_XML=False \
+    GHC_LOG_FORMAT='%(asctime)s - %(name)s - %(levelname)s - %(message)s' \
+    GHC_LOG_LEVEL=30 \
+    GHC_METADATA_CACHE_SECS=900 \
+    GHC_MINIMAL_RUN_FREQUENCY_MINS=10 \
+    GHC_NOTIFICATIONS=False \
+    GHC_NOTIFICATIONS_EMAIL='[email protected],[email protected]' \
+    GHC_NOTIFICATIONS_VERBOSITY=True \
+    GHC_PROBE_HTTP_TIMEOUT_SECS=30 \
+    GHC_REQUIRE_WEBAPP_AUTH=False \
+    GHC_RETENTION_DAYS=30 \
+    GHC_RUNNER_IN_WEBAPP=False \
+    GHC_SELF_REGISTER=False \
+    GHC_SITE_TITLE='GeoHealthCheck' \
+    GHC_SITE_URL='http://localhost' \
+    GHC_SMTP_PASSWORD=None \
+    GHC_SMTP_PORT=None \
+    GHC_SMTP_SERVER=None \
+    GHC_SMTP_SSL=False \
+    GHC_SMTP_TLS=False \
+    GHC_SMTP_USERNAME=None \
+    GHC_VERIFY_SSL=True \
+    GHC_WWW_LINK_EXCEPTION_CHECK=False \
+    SECRET_KEY='d544ccc37dc3ad214c09b1b7faaa64c60351d5c8bb48b342' \
+    SQLALCHEMY_DATABASE_URI='sqlite:////GeoHealthCheck/DB/data.db' \
+    SQLALCHEMY_ENGINE_OPTION_PRE_PING=False
+
+# WSGI server settings, assumed is gunicorn
+ENV \
+    HOST=0.0.0.0 \
+    PORT=80 \
+    WSGI_WORKERS=4 \
+    WSGI_WORKER_TIMEOUT=6000 \
+    WSGI_WORKER_CLASS='gevent'
+
+# GHC Core Plugins modules and/or classes, seldom needed to set:
+# if not specified here or in Container environment
+# all GHC built-in Plugins will be active.
+#ENV GHC_PLUGINS 'GeoHealthCheck.plugins.probe.owsgetcaps,
+#        GeoHealthCheck.plugins.probe.wms, ...., ...
+#        GeoHealthCheck.plugins.check.checks'
+
+# GHC User Plugins, best be overridden via Container environment
+ENV GHC_USER_PLUGINS=''
 
 # Install operating system dependencies
 RUN \
@@ -90,14 +92,28 @@ COPY . /GeoHealthCheck
 
 # Install
 RUN \
-	chmod a+x /*.sh && ./install.sh \
-    # Cleanup TODO: remove unused Locales and TZs
-    && apt-get remove --purge -y ${DEB_BUILD_DEPS} \
+    chmod a+x /*.sh \
+    && ./install.sh
+
+
+FROM base AS development
+
+RUN \
+    apt-get install silversearcher-ag \
+    && pip install -r /GeoHealthCheck/requirements-dev.txt
+
+CMD ["/bin/bash"]
+
+
+FROM base AS runnable
+
+# Cleanup TODO: remove unused Locales and TZs
+RUN \
+    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-compose.yml

@@ -0,0 +1,21 @@
+services:
+  development:
+    build:
+      context: .
+      target: development
+    env_file:
+      - .env
+    volumes:
+      - .:/GeoHealthCheck
+    ports:
+      - 8000:8000
+
+
+  local_runner:
+    build:
+      context: .
+      target: runnable
+    env_file:
+      - .env
+    profiles:
+      - runner

requirements-dev.txt

@@ -1,3 +1,7 @@
 flake8==5.0.4
 Paver==1.3.4
 pylint==2.13.9
+python-lsp-server[all,websockets]
+debugpy
+pylsp-rope
+python-lsp-ruff