Merge branch 'main' into configure-redis

openfoodfacts · Mar 11, 2024 · 0af2935 · 0af2935
2 parents d0431b1 + c96c987
commit 0af2935
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,7 @@
 COMPOSE_FILE=docker-compose.yml;docker/dev.yml
 COMPOSE_PROJECT_NAME=off-query
 COMPOSE_PATH_SEPARATOR=;
+RESTART_POLICY=no
 TAG=latest
 QUERY_PORT=127.0.0.1:5511
 POSTGRES_HOST=localhost

diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml
@@ -111,6 +111,7 @@ jobs:
             echo "COMPOSE_HTTP_TIMEOUT=120" >> .env
             echo "COMPOSE_PROJECT_NAME=off-query" >> .env
             echo "COMPOSE_PATH_SEPARATOR=;" >> .env
+            echo "RESTART_POLICY=always" >> .env
             echo "COMPOSE_FILE=docker-compose.yml" >> .env
             echo "TAG=sha-${{ github.sha }}" >> .env
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
   query_postgres:
     image: postgres:12-alpine
+    restart: ${RESTART_POLICY:-always}
     environment:
       - POSTGRES_USER
       - POSTGRES_PASSWORD
@@ -12,6 +13,7 @@ services:
 
   query:
     image: ghcr.io/openfoodfacts/openfoodfacts-query:${TAG}
+    restart: ${RESTART_POLICY:-always}
     environment:
       - POSTGRES_HOST=query_postgres
       - POSTGRES_PORT=5432