From b349f09dccf6f34de32f229cca6a0b050ff2afb6 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 29 May 2021 16:57:21 +0200 Subject: [PATCH] chore: Use alpine for nginx and upgrade nginx from 1.16 to 1.21 --- docker-compose.yml | 2 +- install/wrap-up.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 957b659686d..22c6e3ffcb9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -272,7 +272,7 @@ services: <<: *restart_policy ports: - "$SENTRY_BIND:80/tcp" - image: "nginx:1.16" + image: "nginx:1.21-alpine" volumes: - type: bind read_only: true diff --git a/install/wrap-up.sh b/install/wrap-up.sh index 2671a3a513a..c8217e30e69 100644 --- a/install/wrap-up.sh +++ b/install/wrap-up.sh @@ -3,7 +3,7 @@ if [[ "$MINIMIZE_DOWNTIME" ]]; then # Start the whole setup, except nginx and relay. $dc up -d --remove-orphans $($dc config --services | grep -v -E '^(nginx|relay)$') - $dc exec -T nginx service nginx reload + $dc restart nginx docker run --rm --network="${COMPOSE_PROJECT_NAME}_default" alpine ash \ -c 'while [[ "$(wget -T 1 -q -O- http://web:9000/_health/)" != "ok" ]]; do sleep 0.5; done'