Update traefik:v3.7 Docker digest to e4d9815

Reviewed-on: #66

.gitea/workflows/workflow.yaml

@@ -47,10 +47,10 @@ jobs:
     needs: [prepare_context]
     if: github.event_name == 'pull_request' && github.event.action != 'closed'
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Deploy via Rsync & Docker
-        uses: easingthemes/ssh-deploy@922253577e23ce0edbfdbf819f0e1ceaecabc61a # v5.1.2
+        uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
         env:
           SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }}
           REMOTE_HOST: ${{ env.SSH_HOST }}
@@ -66,7 +66,7 @@ jobs:
           SCRIPT_AFTER: |
             set -e
             cd ${{ needs.prepare_context.outputs.pr_path }}
-            docker compose --env-file dev.env -f docker-compose.yaml up -d --build --remove-orphans --wait
+            docker compose --env-file dev.env -f docker-compose.yaml -f docker-compose.dev.yaml up -d --build --remove-orphans --wait
 
   # ------------------------------------------------------------------
   # STAGE 3: DEPLOY STAGING
@@ -76,10 +76,10 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Deploy via Rsync & Docker
-        uses: easingthemes/ssh-deploy@922253577e23ce0edbfdbf819f0e1ceaecabc61a # v5.1.2
+        uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
         env:
           SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }}
           REMOTE_HOST: ${{ env.SSH_HOST }}
@@ -92,7 +92,7 @@ jobs:
           SCRIPT_AFTER: |
             set -e
             cd ${{ env.REMOTE_STAGING_PATH }}
-            docker compose --env-file staging.env -f docker-compose.yaml up -d --build --remove-orphans --wait
+            docker compose --env-file staging.env -f docker-compose.yaml -f docker-compose.client.yaml up -d --build --remove-orphans --wait
 
   # ------------------------------------------------------------------
   # STAGE 3.5: DEPLOY PRE-PROD
@@ -100,13 +100,13 @@ jobs:
   deploy_preprod:
     name: Deploy (Pre-Prod)
     runs-on: ubuntu-latest
-    # needs: [deploy_staging]
-    # if: github.ref == 'refs/heads/test_preprod'
+    needs: [deploy_staging]
+    if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Deploy via Rsync & Docker
-        uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1
+        uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
         env:
           SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }}
           REMOTE_HOST: ${{ env.SSH_HOST }}
@@ -122,7 +122,7 @@ jobs:
             docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml -f docker-compose.preprod.yaml up -d --build --remove-orphans --wait
 
       - name: Run E2E Tests
-        uses: appleboy/ssh-action@823bd89e131d8d508129f9443cad5855e9ba96f0 # v1.2.4
+        uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5
         with:
           host: ${{ env.SSH_HOST }}
           username: ${{ env.SSH_USER }}
@@ -165,10 +165,10 @@ jobs:
     needs: [deploy_preprod]
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Deploy via Rsync & Docker
-        uses: easingthemes/ssh-deploy@922253577e23ce0edbfdbf819f0e1ceaecabc61a # v5.1.2
+        uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
         env:
           SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }}
           REMOTE_HOST: ${{ env.SSH_HOST }}

docker-compose.client.yaml

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

docker-compose.dev.yaml

@@ -0,0 +1,16 @@
+services:
+  traefik:
+    networks:
+      - proxy
+      - staging-network
+      - shared_network
+networks:
+  legacy-nginx:
+    name: proxy
+    external: true
+  staging-network:
+    name: staging_proxy
+    external: true
+  shared_network:
+    name: prod_shared-network
+    external: true

docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   traefik:
-    image: "traefik:v3.6@sha256:5d1de6bc6984699e4447787a0e7904437aaea542fecf0fccb79c8c743c7248c8"
+    image: "traefik:v3.7@sha256:e4d98158c01ad752fc1071d4e9573788747230d902cdde00a772516e692d07c9"
     restart: unless-stopped
     security_opt:
       - no-new-privileges:true
@@ -51,8 +51,5 @@ services:
       - traefik.http.routers.https.tls.certresolver=letsencrypt
 networks:
   proxy:
-  shared_network:
-    name: prod_shared-network
-    external: true
 volumes:
   letsencrypt:

preprod/route-to-staging-dev.yaml

@@ -11,7 +11,6 @@ http:
     dev-staging:
       loadBalancer:
         servers:
-          # - url: "http://staging-traefik-1:8080"
           - url: "http://staging-traefik-1:80"
 
 tcp:
@@ -31,5 +30,4 @@ tcp:
       loadBalancer:
         servers:
           # Note: Ensure Traefik trusts the cert at .85 or set insecureSkipVerify
-          # - address: "staging-traefik-1:445"
           - address: "staging-traefik-1:443"

prod/route-to-kovagoadigepe.yaml

@@ -0,0 +1,29 @@
+http:
+  routers:
+    kovagoadi-gepe-http-router:
+      rule: "HostRegexp(`^.+\\.kovagoadi-gepe\\.kovagoadi\\.hu$`)"
+      entryPoints:
+        - "web"
+      service: "kovagoadi-gepe-http"
+      priority: 100
+  services:
+    kovagoadi-gepe-http:
+      loadBalancer:
+        servers:
+          - url: "http://192.168.1.81:80"
+
+tcp:
+  routers:
+    kovagoadi-gepe-secure-router:
+      rule: "HostSNI(`*.kovagoadi-gepe.kovagoadi.hu`)"
+      service: "kovagoadi-gepe-secure"
+      tls:
+        passthrough: true
+      priority: 100
+      entryPoints:
+        - "https"
+  services:  
+    kovagoadi-gepe-secure:
+      loadBalancer:
+        servers:
+          - address: "192.168.1.81:443"

prod/route-to-staging-dev.yaml

@@ -11,7 +11,7 @@ http:
     dev-staging:
       loadBalancer:
         servers:
-          - url: "http://staging:8080"
+          - url: "http://staging-traefik-1:80"
 
 tcp:
   routers:
@@ -30,4 +30,4 @@ tcp:
       loadBalancer:
         servers:
           # Note: Ensure Traefik trusts the cert at .85 or set insecureSkipVerify
-          - address: "staging:445"
+          - address: "staging-traefik-1:443"