Merge pull request #79 from Pet-projects-CodePET/dev_docker

Dev docker
Pet-projects-CodePET · Feb 24, 2024 · f831997 · f831997
2 parents b5d40d4 + 83dfe7e
commit f831997
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -99,4 +99,5 @@ jobs:
           sudo docker compose -f docker-compose-prod.yaml up -d
           sudo docker compose -f docker-compose-prod.yaml exec backend python manage.py migrate
           sudo docker compose -f docker-compose-prod.yaml exec backend python manage.py collectstatic --no-input
+          sudo docker compose -f docker-compose-prod.yaml exec backend cp -r static/. /backend_static/static/
           sudo docker system prune -f
diff --git a/.github/workflows/qa_deploy.yaml b/.github/workflows/qa_deploy.yaml
@@ -99,4 +99,5 @@ jobs:
           sudo docker compose -f docker-compose-prod.yaml up -d
           sudo docker compose -f docker-compose-prod.yaml exec backend python manage.py migrate
           sudo docker compose -f docker-compose-prod.yaml exec backend python manage.py collectstatic --no-input
+          sudo docker compose -f docker-compose-prod.yaml exec backend cp -r static/. /backend_static/static/
           sudo docker system prune -f
diff --git a/infra/docker-compose-prod.yaml b/infra/docker-compose-prod.yaml
@@ -3,6 +3,7 @@ version: '3'
 volumes:
   pg_data:
   static_volume:
+  media_value:
 
 services:
   db:
@@ -19,7 +20,8 @@ services:
     ports:
       - "8000:8000"
     volumes:
-      - static_volume:/backend_static
+      - static_volume:/backend_static/
+      - media_value:/backend_media/
     depends_on:
       - db
 
@@ -28,7 +30,8 @@ services:
     ports:
       - "80:80"
     volumes:
-      - static_volume:/static
+      - static_volume:/staticfiles/
+      - media_value:/var/html/media/
       - /etc/letsencrypt:/etc/letsencrypt
     depends_on:
       - backend

diff --git a/src/backend/config/settings/base.py b/src/backend/config/settings/base.py
@@ -111,7 +111,7 @@
 
 
 STATIC_URL = "static/"
-STATIC_ROOT = Path(BASE_DIR, "collected_static")
+STATIC_ROOT = Path(BASE_DIR, "static")
 
 MEDIA_URL = "media/"
 MEDIA_ROOT = Path(BASE_DIR, "media")