From e1c1d8d733d52efc710676bed41f51d066356c92 Mon Sep 17 00:00:00 2001
From: Fred C <42280769+hypsug0@users.noreply.github.com>
Date: Mon, 12 Feb 2024 14:06:02 +0100
Subject: [PATCH] Fix restart-policy for all container

---
 docker-compose.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 810608b..6882391 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,10 @@
 version: "3.9"
 
+x-restart-policy: &restart-policy
+  restart: ${RESTART_POLICY:-unless-stopped}
+
 x-defaults: &defaults
   user: ${UID}:${GID}
-  restart: ${RESTART_POLICY:-unless-stopped}
 
 x-env-defaults: &env-defaults
   http_proxy: ${HTTP_PROXY:-}
@@ -38,6 +40,7 @@ x-geonature-backend-defaults: &geonature-backend-defaults
 
 services:
   traefik:
+    <<: *restart-policy
     image: traefik:2.10.4
     command:
       - "--providers.docker=true"
@@ -58,6 +61,7 @@ services:
       - ${HTTPS_PORT:-443}:443
 
   redis:
+    <<: *restart-policy
     image: ${REDIS_IMAGE:-redis:7-alpine}
     volumes:
       - redis:/data
@@ -68,6 +72,7 @@ services:
       retries: 5
 
   postgres:
+    <<: *restart-policy
     image: ${POSTGRES_IMAGE:-postgis/postgis:15-3.4}
     environment:
       POSTGRES_DB: ${POSTGRES_DB}
@@ -85,7 +90,7 @@ services:
       retries: 5
 
   usershub:
-    <<: *defaults
+    <<: [*restart-policy,*defaults]
     image: ${USERSHUB_IMAGE}
     depends_on:
       postgres:
@@ -110,7 +115,7 @@ services:
       - "traefik.http.routers.usershub.tls.certResolver=acme-resolver"
 
   taxhub:
-    <<: *defaults
+    <<: [*restart-policy,*defaults]
     image: ${TAXHUB_IMAGE}
     depends_on:
       postgres:
@@ -152,7 +157,7 @@ services:
       taxhub_samples: ${GEONATURE_DB_INSTALL_TAXHUB_SAMPLES:-true}
 
   geonature-worker:
-    <<: *geonature-backend-defaults
+    <<: [*restart-policy,*geonature-backend-defaults]
     depends_on:
       <<: *geonature-depends-on-defaults
       geonature-install-db:
@@ -161,7 +166,7 @@ services:
     command: celery -A geonature.celery_app:app worker --beat --schedule-filename=/dist/media/celerybeat-schedule.db
 
   geonature-backend:
-    <<: *geonature-backend-defaults
+    <<: [*restart-policy,*geonature-backend-defaults]
     depends_on:
       <<: *geonature-depends-on-defaults
       geonature-install-db:
@@ -184,6 +189,7 @@ services:
       - "traefik.http.routers.geonature-backend.tls.certResolver=acme-resolver"
 
   geonature-frontend:
+    <<: *restart-policy
     image: ${GEONATURE_FRONTEND_EXTRA_IMAGE}
     environment:
       - NGINX_LOCATION=${GEONATURE_FRONTEND_PREFIX}