From 0cbd6390ba44bc61071f5f1d9335889f992b80f1 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 30 Jul 2019 19:32:07 +0200 Subject: [PATCH] docker-compose: fix started detection --- configs/nginx-frontend-htpasswd.conf | 2 +- docker-compose.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configs/nginx-frontend-htpasswd.conf b/configs/nginx-frontend-htpasswd.conf index c672bc32..08e04a0b 100644 --- a/configs/nginx-frontend-htpasswd.conf +++ b/configs/nginx-frontend-htpasswd.conf @@ -96,7 +96,7 @@ server { expires epoch; add_header Cache-Control no-cache; - if (!-f $document_root/../started) { + if (!-f $document_root/../../startingblock/started) { rewrite ^/ /wait.json; } } diff --git a/docker-compose.yml b/docker-compose.yml index e40197bc..5344bdbb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,6 +56,7 @@ services: context: . dockerfile: Dockerfile-frontend image: nemunaire/fic-frontend:latest + command: "-startedFile /srv/startingblock/started" ports: - "8080:8080" volumes: @@ -64,6 +65,7 @@ services: - teams:/srv/TEAMS:ro - settings:/srv/SETTINGS:ro - submissions:/srv/submissions + - startingblock:/srv/startingblock depends_on: - fic-backend @@ -93,6 +95,7 @@ services: - files:/srv/FILES:ro - settings:/srv/SETTINGS:ro - teams:/srv/TEAMS:ro + - startingblock:/srv/startingblock:ro depends_on: - fic-frontend - fic-admin @@ -104,5 +107,9 @@ volumes: htdocs: pki: settings: + startingblock: + driver_opts: + type: tmpfs + device: tmpfs submissions: teams: