Merge branch 'main' into renovate/easingthemes-ssh-deploy-6.x

.gitea/workflows/workflow.yaml

@@ -92,7 +92,7 @@ jobs:
           SCRIPT_AFTER: |
             set -e
             cd ${{ env.REMOTE_STAGING_PATH }}
-            docker compose --env-file staging.env -f docker-compose.yaml -f docker-compose.client.yaml up -d --build --remove-orphans --wait
+            docker compose --env-file staging.env -f docker-compose.yaml up -d --build --remove-orphans --wait
 
   # ------------------------------------------------------------------
   # STAGE 3.5: DEPLOY PRE-PROD

docker-compose.client.yaml

@@ -1,9 +0,0 @@
-services:
-  traefik:
-    networks:
-      - proxy
-      - shared_network
-networks:
-  shared_network:
-    name: prod_shared-network
-    external: true

docker-compose.dev.yaml

@@ -3,7 +3,6 @@ services:
     networks:
       - proxy
       - staging-network
-      - shared_network
 networks:
   legacy-nginx:
     name: proxy
@@ -11,6 +10,3 @@ networks:
   staging-network:
     name: staging_proxy
     external: true
-  shared_network:
-    name: prod_shared-network
-    external: true

docker-compose.yaml

@@ -1,11 +1,12 @@
 services:
   traefik:
-    image: "traefik:v3.7@sha256:eb328e2c806c53aafbbace6c451fa54d268961261a85452fcf0fb752a30c17be"
+    image: "traefik:v3.6@sha256:5e113a222e0a43c112bd8caeb0dfb42685be2c2eb190c79176c99c1259e4fa10"
     restart: unless-stopped
     security_opt:
       - no-new-privileges:true
     networks:
       - proxy
+      - shared_network
     command:
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
@@ -51,5 +52,8 @@ services:
       - traefik.http.routers.https.tls.certresolver=letsencrypt
 networks:
   proxy:
+  shared_network:
+    name: prod_shared-network
+    external: true
 volumes:
   letsencrypt: