diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index e2c34974..51804c7d 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -18,7 +18,7 @@ services: restart: always depends_on: - backend - build: + build: context: ./rsconcept/frontend dockerfile: Dockerfile.dev args: @@ -27,7 +27,6 @@ services: - 3002:3002 command: npm run dev -- --host - backend: container_name: dev-portal-backend restart: always @@ -41,9 +40,7 @@ services: volumes: - django_static_volume:/home/app/web/static - django_media_volume:/home/app/web/media - command: - gunicorn -w 3 project.wsgi --bind 0.0.0.0:8002 - + command: gunicorn -w 3 project.wsgi --bind 0.0.0.0:8002 postgresql-db: container_name: dev-portal-db @@ -52,4 +49,3 @@ services: env_file: ./postgresql/.env.dev volumes: - postgres_volume:/var/lib/postgresql/data - diff --git a/docker-compose-prod-local.yml b/docker-compose-prod-local.yml index 375cd93f..39226700 100644 --- a/docker-compose-prod-local.yml +++ b/docker-compose-prod-local.yml @@ -18,7 +18,7 @@ services: restart: always depends_on: - backend - build: + build: context: ./rsconcept/frontend args: BUILD_TYPE: production.local @@ -26,7 +26,6 @@ services: - 3001 command: serve -s /home/node -l 3001 - backend: container_name: local-portal-backend restart: always @@ -40,9 +39,7 @@ services: volumes: - django_static_volume:/home/app/web/static - django_media_volume:/home/app/web/media - command: - gunicorn -w 3 project.wsgi --bind 0.0.0.0:8001 - + command: gunicorn -w 3 project.wsgi --bind 0.0.0.0:8001 postgresql-db: container_name: local-portal-db @@ -52,7 +49,6 @@ services: volumes: - postgres_volume:/var/lib/postgresql/data - nginx: container_name: local-portal-router restart: always @@ -66,7 +62,8 @@ services: - 3001:3001 depends_on: - backend - command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'" + - frontend + 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 41e15a2d..a1d01f8f 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -101,6 +101,7 @@ services: - 443:443 depends_on: - backend + - frontend command: '/bin/sh -c ''while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g "daemon off;"''' volumes: - django_static_volume:/var/www/static