From 5b51d7dfefd518ec6a2b784fcc64e65a1ca97c42 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-42-113.eu-central-1.compute.internal>
Date: Tue, 31 Jan 2023 17:53:42 +0000
Subject: [PATCH] bug fixed

---
 Docker/Prod/docker-compose-cloudflare.yml |  7 ++++---
 Docker/Prod/docker-compose.yml            | 15 ++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Docker/Prod/docker-compose-cloudflare.yml b/Docker/Prod/docker-compose-cloudflare.yml
index 2ee2e81..d6040c4 100644
--- a/Docker/Prod/docker-compose-cloudflare.yml
+++ b/Docker/Prod/docker-compose-cloudflare.yml
@@ -6,7 +6,7 @@ services:
     volumes:
       - dbdata:/var/lib/postgresql/data
     env_file:
-      - config/db/databasepostgresql_env
+      - ../../config/db/databasepostgresql_env
 
   rabbitmq:
     image: rabbitmq
@@ -19,8 +19,9 @@ services:
       context: ../../
       dockerfile: Docker/Prod/Dockerfile
     command: >
-      bash -c "python3 src/manage.py makemigrations
+        bash -c "python3 src/manage.py makemigrations
         && python3 src/manage.py migrate
+        && python3 src/manage.py collectstatic --noinput
         && gunicorn --chdir src --bind 0.0.0.0:8000 config.wsgi"
     ports:
       - "8000:8000"
@@ -35,7 +36,7 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./config/nginx/server-cloudflare.conf:/etc/nginx/conf.d/default.conf:ro
+      - ../../config/nginx/server-cloudflare.conf:/etc/nginx/conf.d/default.conf:ro
       - static_volume:/django_static
     depends_on:
       - django
diff --git a/Docker/Prod/docker-compose.yml b/Docker/Prod/docker-compose.yml
index 4b835e8..39da0a2 100644
--- a/Docker/Prod/docker-compose.yml
+++ b/Docker/Prod/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     volumes:
       - dbdata:/var/lib/postgresql/data
     env_file:
-      - config/db/databasepostgresql_env
+      - ../../config/db/databasepostgresql_env
 
   rabbitmq:
     image: rabbitmq
@@ -19,8 +19,9 @@ services:
       context: ../../
       dockerfile: Docker/Prod/Dockerfile
     command: >
-      bash -c "python3 src/manage.py makemigrations
+        bash -c "python3 src/manage.py makemigrations
         && python3 src/manage.py migrate
+        && python3 src/manage.py collectstatic --noinput
         && gunicorn --chdir src --bind 0.0.0.0:8000 config.wsgi"
     ports:
       - "8000:8000"
@@ -36,9 +37,9 @@ services:
       - "80:80"
       - "443:443"
     volumes:
-      - ./config/nginx/server.conf:/etc/nginx/conf.d/default.conf:ro
-      - ./config/certbot/conf:/etc/letsencrypt
-      - ./config/certbot/www:/var/www/certbot
+      - ../../config/nginx/server.conf:/etc/nginx/conf.d/default.conf:ro
+      - ../../config/certbot/conf:/etc/letsencrypt
+      - ../../config/certbot/www:/var/www/certbot
       - static_volume:/django_static
     depends_on:
       - django
@@ -47,8 +48,8 @@ services:
   certbot:
     image: certbot/certbot
     volumes:
-      - ./config/certbot/conf:/etc/letsencrypt
-      - ./config/certbot/www:/var/www/certbot
+      - ../../config/certbot/conf:/etc/letsencrypt
+      - ../../config/certbot/www:/var/www/certbot
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
 
 volumes: