studio/docs
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛(docker) update docker-compose.yml to make nginx depend on app-dev

Browse Source 
Modified docker-compose.yml to ensure nginx starts only after app-dev.

Signed-off-by: lindenb1 <linden@b1-systems.de>
This commit is contained in:
lindenb1
2024-10-15 11:53:02 +02:00
committed by Anthony LC
parent 9ed6b11bb1
commit 7e8732822b
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -25,6 +25,7 @@ and this project adheres to
- 🐛(frontend) invalidate queries after removing user #336 - 🐛(frontend) invalidate queries after removing user #336
- 🐛(backend) Fix dysfunctional permissions on document create #329 - 🐛(backend) Fix dysfunctional permissions on document create #329
- 🐛(backend) fix nginx docker container #340
## [1.5.1] - 2024-10-10 ## [1.5.1] - 2024-10-10

1
Makefile
View File

@@ -122,6 +122,7 @@ logs: ## display app-dev logs (follow mode)
run: ## start the wsgi (production) and development server run: ## start the wsgi (production) and development server
@$(COMPOSE) up --force-recreate -d celery-dev @$(COMPOSE) up --force-recreate -d celery-dev
@$(COMPOSE) up --force-recreate -d nginx
@$(COMPOSE) up --force-recreate -d y-provider @$(COMPOSE) up --force-recreate -d y-provider
@echo "Wait for postgresql to be up..." @echo "Wait for postgresql to be up..."
@$(WAIT_DB) @$(WAIT_DB)

2
docker-compose.yml
View File

@@ -63,7 +63,6 @@ services:
- mailcatcher - mailcatcher
- redis - redis
- createbuckets - createbuckets
- nginx
celery-dev: celery-dev:
user: ${DOCKER_USER:-1000} user: ${DOCKER_USER:-1000}
@@ -118,6 +117,7 @@ services:
- ./docker/files/etc/nginx/conf.d:/etc/nginx/conf.d:ro - ./docker/files/etc/nginx/conf.d:/etc/nginx/conf.d:ro
depends_on: depends_on:
- keycloak - keycloak
- app-dev
frontend-dev: frontend-dev:
user: "${DOCKER_USER:-1000}" user: "${DOCKER_USER:-1000}"