ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-25 20:40:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add missing dependency

Browse Source
This commit is contained in:
IRBorisov 2024-03-15 14:40:47 +03:00
parent fd9b5d2728
commit 8e7491b2e2
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker-compose-dev.yml
View File

@ -18,7 +18,7 @@ services:
restart: always restart: always
depends_on: depends_on:
- backend - backend
build: build:
context: ./rsconcept/frontend context: ./rsconcept/frontend
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
args: args:
@ -27,7 +27,6 @@ services:
- 3002:3002 - 3002:3002
command: npm run dev -- --host command: npm run dev -- --host
backend: backend:
container_name: dev-portal-backend container_name: dev-portal-backend
restart: always restart: always
@ -41,9 +40,7 @@ services:
volumes: volumes:
- django_static_volume:/home/app/web/static - django_static_volume:/home/app/web/static
- django_media_volume:/home/app/web/media - django_media_volume:/home/app/web/media
command: command: gunicorn -w 3 project.wsgi --bind 0.0.0.0:8002
gunicorn -w 3 project.wsgi --bind 0.0.0.0:8002
postgresql-db: postgresql-db:
container_name: dev-portal-db container_name: dev-portal-db
@ -52,4 +49,3 @@ services:
env_file: ./postgresql/.env.dev env_file: ./postgresql/.env.dev
volumes: volumes:
- postgres_volume:/var/lib/postgresql/data - postgres_volume:/var/lib/postgresql/data

11
docker-compose-prod-local.yml
View File

@ -18,7 +18,7 @@ services:
restart: always restart: always
depends_on: depends_on:
- backend - backend
build: build:
context: ./rsconcept/frontend context: ./rsconcept/frontend
args: args:
BUILD_TYPE: production.local BUILD_TYPE: production.local
@ -26,7 +26,6 @@ services:
- 3001 - 3001
command: serve -s /home/node -l 3001 command: serve -s /home/node -l 3001
backend: backend:
container_name: local-portal-backend container_name: local-portal-backend
restart: always restart: always
@ -40,9 +39,7 @@ services:
volumes: volumes:
- django_static_volume:/home/app/web/static - django_static_volume:/home/app/web/static
- django_media_volume:/home/app/web/media - django_media_volume:/home/app/web/media
command: command: gunicorn -w 3 project.wsgi --bind 0.0.0.0:8001
gunicorn -w 3 project.wsgi --bind 0.0.0.0:8001
postgresql-db: postgresql-db:
container_name: local-portal-db container_name: local-portal-db
@ -52,7 +49,6 @@ services:
volumes: volumes:
- postgres_volume:/var/lib/postgresql/data - postgres_volume:/var/lib/postgresql/data
nginx: nginx:
container_name: local-portal-router container_name: local-portal-router
restart: always restart: always
@ -66,7 +62,8 @@ services:
- 3001:3001 - 3001:3001
depends_on: depends_on:
- backend - 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: volumes:
- django_static_volume:/var/www/static - django_static_volume:/var/www/static
- django_media_volume:/var/www/media - django_media_volume:/var/www/media

1
docker-compose-prod.yml
View File

@ -101,6 +101,7 @@ services:
- 443:443 - 443:443
depends_on: depends_on:
- backend - backend
- frontend
command: '/bin/sh -c ''while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g "daemon off;"''' command: '/bin/sh -c ''while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g "daemon off;"'''
volumes: volumes:
- django_static_volume:/var/www/static - django_static_volume:/var/www/static