From 2c6038116aa60d70dfead9b4425cbf58cb9cb76b Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 8 Aug 2023 18:14:30 +0300
Subject: [PATCH] Setup nginx for django static

---
 docker-compose-dev.yml          | 13 -------------
 docker-compose-prod.yml         |  9 +++++----
 nginx/default.conf              |  4 ++--
 rsconcept/backend/entrypoint.sh |  1 -
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 37683125..416e9765 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -26,7 +26,6 @@ services:
     restart: always
     depends_on:
       - postgresql-db
-      - nginx
     build:
       context: ./rsconcept/backend
     env_file: ./rsconcept/backend/.env.dev
@@ -46,15 +45,3 @@ services:
     volumes:
       - postgres_volume:/var/lib/postgresql/data
 
-
-  nginx:
-    restart: always
-    build:
-      context: ./nginx
-    ports:
-      - 1337:80
-    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
-    volumes:
-      - django_static_volume:/var/www/static
-      - django_media_volume:/var/www/media
-
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 3a9a3955..337d42c9 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -32,7 +32,6 @@ services:
     restart: always
     depends_on:
       - postgresql-db
-      - nginx
     secrets:
       - db_password
       - django_key
@@ -42,8 +41,8 @@ services:
     environment:
       SECRET_KEY: /run/secrets/django_key
       DB_PASSWORD: /run/secrets/db_password
-    ports:
-      - 8000:8000
+    expose:
+      - 8000
     volumes:
       - django_static_volume:/home/app/web/static
       - django_media_volume:/home/app/web/media
@@ -68,7 +67,9 @@ services:
     build:
       context: ./nginx
     ports:
-      - 1337:80
+      - 8000:80
+    depends_on:
+      - backend
     command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
     volumes:
       - django_static_volume:/var/www/static
diff --git a/nginx/default.conf b/nginx/default.conf
index 56fd420b..5d057192 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -1,12 +1,12 @@
 upstream innerdjango {
-    server back:8000;
+    server backend:8000;
     # `backend` is the service's name in docker-compose.yml,
     # The `innerdjango` is the name of upstream, used by nginx below. 
 }
 
 server {
     listen 80;
-    server_name localhost dev.concept.ru www.dev.concept.ru portal.acconcept.ru www.portal.acconcept.ru;
+    server_name dev.concept.ru www.dev.concept.ru portal.acconcept.ru www.portal.acconcept.ru;
     location / {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $host;
diff --git a/rsconcept/backend/entrypoint.sh b/rsconcept/backend/entrypoint.sh
index 4a1100bd..dff4dec6 100644
--- a/rsconcept/backend/entrypoint.sh
+++ b/rsconcept/backend/entrypoint.sh
@@ -13,7 +13,6 @@ fi
 
 cd $APP_HOME
 python $APP_HOME/manage.py collectstatic --noinput --clear
-python $APP_HOME/manage.py makemigrations
 python $APP_HOME/manage.py migrate
 
 # Execute given input command