Updates dependencies and configures Docker

Updates Ubuntu, Django, and PostGIS versions to leverage the latest features and security patches.

Configures the Docker environment to align with the updated dependencies.
Includes installing necessary GDAL libraries in the Dockerfile.
The application is now served using `python manage.py runserver` instead of gunicorn, and nginx handles static files and proxying.

Author: nuest

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
 
     services:
       db:
-        image: postgis/postgis:14-3.3
+        image: postgis/postgis:17-3.5
         env:
           POSTGRES_USER: optimap
           POSTGRES_PASSWORD: optimap
@@ -76,7 +76,7 @@ jobs:
 
     services:
       db:
-        image: postgis/postgis:14-3.3
+        image: postgis/postgis:17-3.5
         env:
           POSTGRES_USER: optimap
           POSTGRES_PASSWORD: optimap

Dockerfile

@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION=20.04
+ARG UBUNTU_VERSION=22.04
 
 FROM ubuntu:${UBUNTU_VERSION}
 
@@ -15,12 +15,13 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/Berlin"
 # install Python
 RUN apt-get update && \
     apt-get install -y -qq python-is-python3 && \
-    apt-get install -y -qq python3-pip
+    apt-get install -y -qq python3-pip tzdata
 
 # install GDAL from UbuntuGIS
 RUN apt-get update && \
     apt-get install -y -qq software-properties-common && \
     add-apt-repository ppa:ubuntugis/ppa && \
+    apt-get install -y -qq gdal-bin libgdal-dev
 
 RUN pip install gdal=="$(gdal-config --version).*"
 
@@ -32,7 +33,7 @@ COPY requirements.txt /tmp/requirements.txt
 
 RUN set -ex && \
     pip install --upgrade pip && \
-    pip install -r /tmp/requirements.txt && \
+    pip install --no-cache-dir -r /tmp/requirements.txt && \
     rm -rf /root/.cache/
 
 COPY . /code/
@@ -41,5 +42,5 @@ RUN python manage.py collectstatic --noinput
 
 EXPOSE 8000
 
-# replace demo.wsgi with <project_name>.wsgi
-CMD ["gunicorn", "--bind", ":8000", "--workers", "2", "optimap.wsgi"]
+#CMD ["gunicorn", "--bind", ":8000", "--workers", "2", "optimap.wsgi"]
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000" ]

README.md

@@ -41,24 +41,22 @@ After starting the containers, apply database migrations:
 
 ```bash
 # run migrations, in the directory where docker-compose is to resolve the name "web"
-docker-compose run web python manage.py makemigrations
-docker-compose run web python manage.py migrate
+docker-compose run app python manage.py makemigrations # should not detect and changes, otherwise your local config might be outdated
+docker-compose run app python manage.py migrate
 ```
 
-Now open a browser at <http://localhost:8001/>.
+Now open a browser at <http://localhost:80/>.
 
 #### Services Overview
 
 - db: Runs a PostgreSQL database with PostGIS extensions. Data is persisted in a Docker volume named db_data.
-- app: Python-based app serving HTTP requests.
-- web: Our primary Django web application.
+- app: Our primary Django web application.
 - webserver: An Nginx server for serving static files and test files.
 
 #### Ports
 
 - 5434: Database (PostgreSQL/PostGIS)
-- 8002: App (Python HTTP server)
-- 8001: Web application (Django server)
+- 8000: App (Django server)
 - 8080: Webserver (Nginx)
 
 ## Development

docker-compose.yml

@@ -1,9 +1,6 @@
-version: "3.9"
-
 services:
   db:
-    image: postgis/postgis:15-3.4
-    container_name: project_db
+    image: postgis/postgis:17-3.5
     environment:
       POSTGRES_DB: optimap
       POSTGRES_USER: optimap
@@ -13,33 +10,30 @@ services:
     volumes:
       - db_data:/var/lib/postgresql/data
 
-  web:
+  app:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: project_web
     environment:
       DATABASE_URL: postgis://optimap:optimap@db:5432/optimap?sslmode=disable
       OPTIMAP_CACHE: "dummy"
       OPTIMAP_DEBUG: "True"
     volumes:
-      - .:/code
-      - ./fixtures:/fixtures # Mount fixture/test data
+      - ".:/code:ro"
+      - "./fixtures:/fixtures:ro"
     ports:
-      - "8001:8000"
+      - "8000:8000"
     depends_on:
       - db
-    command: python manage.py runserver 0.0.0.0:8000
 
   webserver:
-    image: nginx:1.24-alpine
-    container_name: project_webserver
+    image: nginx:1.27-alpine
     volumes:
-      - ./test_files:/usr/share/nginx/html:ro
+      - "./etc/nginx.conf:/etc/nginx/nginx.conf:ro"
     ports:
-      - "8080:80"
+      - "80:80"
     depends_on:
-      - web
+      - app
 
 volumes:
   db_data:

etc/nginx.conf

@@ -0,0 +1,31 @@
+
+worker_processes 1;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    sendfile on;
+    keepalive_timeout 65;
+    gzip on;
+
+    upstream optimap {
+        server app:8000;
+    }
+
+    server {
+        listen 80;
+        server_name localhost;
+
+        location / {
+            proxy_pass http://optimap;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $host;
+            proxy_redirect off;
+        }
+    }
+
+}

optimap/.env.example

@@ -3,6 +3,8 @@ OPTIMAP_DEBUG=False
 OPTIMAP_CACHE=default
 OPTIMAP_CACHE_SECONDS=3600
 
+CSRF_COOKIE_SECURE=False
+
 OPTIMAP_BASE_URL=...
 
 OPTIMAP_DB_HOST=localhost

requirements.txt

@@ -5,7 +5,7 @@ blessed==1.20.0
 beautifulsoup4==4.12.3
 certifi==2024.12.14
 charset-normalizer==3.4.1
-Django==5.1.7
+Django==5.1.9
 django-environ==0.11.2
 django-filter==24.3
 django-leaflet==0.31.0