From 7e8732822bd29fe9cdfd845087053d8e7846eab6 Mon Sep 17 00:00:00 2001 From: lindenb1 Date: Tue, 15 Oct 2024 11:53:02 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(docker)=20update=20docker-compose.?= =?UTF-8?q?yml=20to=20make=20nginx=20depend=20on=20app-dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modified docker-compose.yml to ensure nginx starts only after app-dev. Signed-off-by: lindenb1 --- CHANGELOG.md | 1 + Makefile | 1 + docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f23594a..d418a60a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to - 🐛(frontend) invalidate queries after removing user #336 - 🐛(backend) Fix dysfunctional permissions on document create #329 +- 🐛(backend) fix nginx docker container #340 ## [1.5.1] - 2024-10-10 diff --git a/Makefile b/Makefile index 7aed3003..925485d9 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,7 @@ logs: ## display app-dev logs (follow mode) run: ## start the wsgi (production) and development server @$(COMPOSE) up --force-recreate -d celery-dev + @$(COMPOSE) up --force-recreate -d nginx @$(COMPOSE) up --force-recreate -d y-provider @echo "Wait for postgresql to be up..." @$(WAIT_DB) diff --git a/docker-compose.yml b/docker-compose.yml index b3e90496..5c7e4d1a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,7 +63,6 @@ services: - mailcatcher - redis - createbuckets - - nginx celery-dev: user: ${DOCKER_USER:-1000} @@ -118,6 +117,7 @@ services: - ./docker/files/etc/nginx/conf.d:/etc/nginx/conf.d:ro depends_on: - keycloak + - app-dev frontend-dev: user: "${DOCKER_USER:-1000}"