From 2157ed5a9784356f9b9cc4da2c90af919fd16184 Mon Sep 17 00:00:00 2001
From: gw3000 <weissenbaeck@posteo.de>
Date: Fri, 21 Jul 2023 22:42:33 +0200
Subject: [PATCH] cleaned up docker-compose files

---
 docker-compose.prod.yml |  9 ++++++---
 docker-compose.yaml     | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index f9fce57..62250c9 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -5,7 +5,11 @@ services:
     build:
       context: ./app
       dockerfile: Dockerfile.prod
-    command: bash -c 'while !</dev/tcp/db/5432; do sleep 1; done; python manage.py collectstatic; gunicorn --bind 0.0.0.0:8000 core.wsgi'
+    command: > 
+      bash -c 'while !</dev/tcp/db/5432; do sleep 1; done;
+      python manage.py migrate;
+      python manage.py collectstatic --no-input --no-post-process;
+      gunicorn --bind 0.0.0.0:8000 core.wsgi'
     expose:
       - 8000
     environment:
@@ -17,13 +21,12 @@ services:
       - "DB_PORT=${DB_PORT}"
       - "DB_USER=${DB_USER}"
       - "DEBUG=${DEBUG}"
-      - "DJANGO_ALLOWED_HOSTS=${DJANGO_ALLOWED_HOSTS}"
       - "SECRET_KEY=${SECRET_KEY}"
     depends_on:
       - db
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.django.rule=Host(`${DJANGO_ALLOWED_HOSTS}`)"
+      - "traefik.http.routers.django.rule=Host(`${ALLOWED_HOSTS}`)"
       - "traefik.http.routers.django.tls=true"
       - "traefik.http.routers.django.tls.certresolver=letsencrypt"
   db:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6c06dd9..a05fe83 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,7 +3,12 @@ version: '3.8'
 services:
   web:
     build: ./app
-    command: bash -c 'while !</dev/tcp/db/5432; do sleep 1; done; python manage.py makemigrations; python manage.py migrate; python manage.py runserver 0.0.0.0:8000'
+    command: >
+      bash -c 'while !</dev/tcp/db/5432; do sleep 1; done;
+      python manage.py makemigrations;
+      python manage.py migrate;
+      python manage.py collectstatic --no-input --no-post-process;
+      python manage.py runserver 0.0.0.0:8000'
     volumes:
       - ./app:/app
     expose:
@@ -17,13 +22,12 @@ services:
       - "DB_PORT=${DB_PORT}"
       - "DB_USER=${DB_USER}"
       - "DEBUG=${DEBUG}"
-      - "DJANGO_ALLOWED_HOSTS=${DJANGO_ALLOWED_HOSTS}"
       - "SECRET_KEY=${SECRET_KEY}"
     depends_on:
       - db
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.django.rule=Host(`${DJANGO_ALLOWED_HOSTS}`)"
+      - "traefik.http.routers.django.rule=Host(`${ALLOWED_HOSTS}`)"
   db:
     image: postgres:15-alpine
     volumes: