From aefde96f3660dc6d54c16a4e0073a97c087c4bdf Mon Sep 17 00:00:00 2001
From: Ambroise Maupate <ambroise@rezo-zero.com>
Date: Thu, 7 Mar 2024 13:41:42 +0100
Subject: [PATCH] fix: Fixed docker compose specification with `extends` and
 `depends_on`

---
 docker-compose.prod.yml | 16 +++-------------
 docker-compose.yml      |  8 +++-----
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 123d547..d190548 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -104,7 +104,7 @@ services:
             - "com.centurylinklabs.watchtower.enable=true"
             - "com.centurylinklabs.watchtower.depends-on=/skeleton-app-1"
 
-    app:
+    app: &app_template
         image: my-registry/roadiz_skeleton:latest
         restart: always
         depends_on:
@@ -145,26 +145,16 @@ services:
             - "com.centurylinklabs.watchtower.depends-on=/skeleton-redis-1"
 
     worker:
-        extends:
-            service: app
+        <<: *app_template
         deploy:
             # Do not use more than 1 replica if you're using Varnish and need to purge/ban cache
             # from your workers. Varnish ACL hostnames won't be resolved correctly.
             replicas: 1
         entrypoint: [ "php", "/var/www/html/bin/console", "messenger:consume", "async", "--time-limit=1800" ]
-        restart: always
-        labels:
-            - "com.centurylinklabs.watchtower.enable=true"
-            - "com.centurylinklabs.watchtower.depends-on=/skeleton-redis-1"
 
     cron:
-        extends:
-            service: app
+        <<: *app_template
         entrypoint: 'docker-cron-entrypoint'
-        restart: always
-        labels:
-            - "com.centurylinklabs.watchtower.enable=true"
-            - "com.centurylinklabs.watchtower.depends-on=/skeleton-redis-1"
 
     #solr:
     #    image: my-registry/roadiz_skeleton/solr:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 55fe755..8700a3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,7 +49,7 @@ services:
             - "traefik.http.routers.${APP_NAMESPACE}_pma_secure.rule=Host(${HOSTNAME_PMA})"
             - "traefik.http.routers.${APP_NAMESPACE}_pma_secure.service=${APP_NAMESPACE}_pma"
 
-    app:
+    app: &app_template
         # Need to pass all vars to docker env for Crontab and supervisor scripts
         #env_file: "./.env.local"
         build:
@@ -113,8 +113,7 @@ services:
 #            - "traefik.http.routers.${APP_NAMESPACE}_secure.service=${APP_NAMESPACE}"
 
     worker:
-        extends:
-            service: app
+        <<: *app_template
         deploy:
             # Do not use more than 1 replica if you're using Varnish and need to purge/ban cache
             # from your workers. Varnish ACL hostnames won't be resolved correctly.
@@ -123,8 +122,7 @@ services:
         restart: unless-stopped
 
     cron:
-        extends:
-            service: app
+        <<: *app_template
         # https://github.com/dubiousjim/dcron/issues/13#issuecomment-1406937781
         init: true
         entrypoint: [ "crond", "-f", "-L", "15" ]