update test deploy config

Author: nuest

Dockerfile

@@ -10,8 +10,6 @@ ENV OPTIMAP_ALLOWED_HOST=*
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/Berlin"
 
-# TODO: see https://www.joseferben.com/posts/django-on-flyio/ for more improvements
-
 # install Python
 RUN apt-get update && \
     apt-get install -y -qq python-is-python3 && \

README.md

@@ -32,7 +32,7 @@ A complete list of existing parameters is provided in the file `optimap/.env.exa
 The project is containerized using Docker, with services defined in `docker-compose.yml`. To start all services, run:
 
 ```bash
-docker-compose up
+docker compose up
 ```
 
 ### Initial Setup
@@ -41,8 +41,9 @@ 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 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
+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
+docker compose run app python manage.py loaddata fixtures/test_data.json
 ```
 
 Now open a browser at <http://localhost:80/>.

docker-compose.deploy.yml

@@ -0,0 +1,46 @@
+services:
+  db:
+    image: postgis/postgis:17-3.5
+    environment:
+      POSTGRES_DB: optimap
+      POSTGRES_USER: optimap
+      POSTGRES_PASSWORD: optimap
+      #POSTGRES_PASSWORD_FILE: database_password
+    ports:
+      - "5434:5432"
+    volumes:
+      - optimap-volume:/var/lib/postgresql/data
+    #secrets:
+    #  - database_password
+
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    environment:
+      #see local .env file on the server
+      DATABASE_URL: postgis://optimap:optimap@db:5432/optimap?sslmode=disable
+      OPTIMAP_DEBUG: "False"
+    volumes:
+      - ".:/code:ro"
+      - "./fixtures:/fixtures"
+    depends_on:
+      - db
+
+  webserver:
+    image: nginx:1.27-alpine
+    volumes:
+      - "./etc/nginx.deploy.conf:/etc/nginx/nginx.conf:ro"
+    ports:
+      - "80:80"
+    depends_on:
+      - app
+
+volumes:
+  optimap-volume:
+    external: true
+    driver: local
+
+#secrets:
+#  database_password:
+#    file: /var/www/komet/database_password.secret

etc/nginx.deploy.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 optimap.geo.tu-dresden.de;
+
+        location / {
+            proxy_pass http://optimap;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $host;
+            proxy_redirect off;
+        }
+    }
+
+}