Changed docker-compose.yaml file to match the currently running one at staging env

Merge pull request 'Update traefik:v3.7 Docker digest to 6d3e069' (#89 ) from renovate/traefik-v3.7 into main
Reviewed-on: #89
2026-10-26 23:36:25 +01:00 · 2026-10-21 10:14:45 +02:00 · 2026-10-21 02:33:06 +00:00 · 2026-10-17 23:32:07 +02:00 · 2026-10-17 02:31:54 +00:00 · 2026-10-08 21:01:37 +02:00
5 changed files with 31 additions and 12 deletions
@@ -47,7 +47,7 @@ jobs:
    needs: [prepare_context]
    if: github.event_name == 'pull_request' && github.event.action != 'closed'
    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

      - name: Deploy via Rsync & Docker
        uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
@@ -76,7 +76,7 @@ jobs:
    runs-on: ubuntu-latest
    if: github.ref == 'refs/heads/main'
    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

      - name: Deploy via Rsync & Docker
        uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
@@ -103,7 +103,7 @@ jobs:
    needs: [deploy_staging]
    if: github.ref == 'refs/heads/main'
    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

      - name: Deploy via Rsync & Docker
        uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
@@ -165,7 +165,7 @@ jobs:
    needs: [deploy_preprod]
    if: github.ref == 'refs/heads/main'
    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

      - name: Deploy via Rsync & Docker
        uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7@sha256:25cd7b175a493ea66a40329e23a649b59eda38b7e2a570493bf63fc4d74fd1c1"
+    image: "traefik:v3.7@sha256:6d3e069ee484ab1da5adfdda555a75eb9b1545ef09096a0cc7c3043101986a20"
    restart: unless-stopped
    security_opt:
      - no-new-privileges:true
@@ -9,7 +9,7 @@ services:
    command:
      - "--providers.docker=true"
      - "--providers.docker.exposedbydefault=false"
-      - "--providers.docker.network=proxy"
+      - "--providers.docker.network=prod_shared-network"
      - "--providers.docker.constraints=Label(`env`, `${ENV}`)"
      - "--entryPoints.web.address=:80"
      - "--entryPoints.https.address=:443"
@@ -19,8 +19,9 @@ services:
      - "--certificatesresolvers.letsencrypt.acme.email=kovagoadi@gmail.com"
      - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
      - "--certificatesResolvers.letsencrypt.acme.caServer=${CERTBOT_CA_RESOLVER}"
-      - "${TRAEFIK_LEGACY_OPT:-}"
-      - "--providers.file.watch=true"
+      # - "--providers.file.watch=true"
+      - "--accesslog"
+      - "--log.level=INFO"
    # extra_hosts:
    #   - "staging:${STAGING_IP:-192.168.1.85}"
    #   - "webserver:${LEGACY_IP:-192.168.1.85}"
@@ -31,10 +32,10 @@ services:
    volumes:
      - "/var/run/docker.sock:/var/run/docker.sock:ro"
      - "letsencrypt:/letsencrypt"
-      - "./${ENV}:/etc/traefik"
+      # - "./${ENV}:/etc/traefik"

  whoami:
-    image: "traefik/whoami@sha256:200689790a0a0ea48ca45992e0450bc26ccab5307375b41c84dfc4f2475937ab"
+    image: "traefik/whoami@sha256:c4717a8d1f0134a7444e24f881160e033991f23027c6c5a9a3f8fd22e70d1d44"
    restart: unless-stopped
    networks:
      - proxy
@@ -13,10 +13,16 @@ tcp:
      entryPoints:
        - "https"

+  serversTransports:
+    nginx-legacy-transport-secure:
+      proxyProtocol:
+        version: 2
+
  services:
    # Service defining the external IP
    nginx-legacy-service-secure:
      loadBalancer:
+        serversTransport: nginx-legacy-transport-secure
        servers:
          # This is the actual external IP and Port of your Nginx
          - address: "webserver:443"
@@ -13,10 +13,16 @@ tcp:
      entryPoints:
        - "https"

+  serversTransports:
+    nginx-legacy-transport-secure:
+      proxyProtocol:
+        version: 2
+
  services:
    # Service defining the external IP
    nginx-legacy-service-secure:
      loadBalancer:
+        serversTransport: nginx-legacy-transport-secure
        servers:
          # This is the actual external IP and Port of your Nginx
          - address: "webserver:443"
@@ -25,7 +31,7 @@ http:
  routers:
    # 1. TRAEFIK-MANAGED ACME HANDLER (Removed manual router)
    traefik-acme-handler:
-      rule: "Host(`test-whoami.kovagoadi.hu`) && PathPrefix(`/.well-known/acme-challenge/`)"
+      rule: "PathPrefix(`/.well-known/acme-challenge/`)"
      entryPoints:
        - "web"
      service: "acme-http@internal" # This is the internal service name
@@ -5,6 +5,9 @@ http {
        listen 80;
        server_name _;

+        real_ip_header X-Forwarded-For;
+        set_real_ip_from 0.0.0.0/0;
+
        location / {
            add_header X-Mock-Service "legacy";
            return 200 "Mock Nginx Legacy HTTP\n";
@@ -12,9 +15,12 @@ http {
    }

    server {
-        listen 443 ssl;
+        listen 443 ssl proxy_protocol;
        server_name _;

+        real_ip_header proxy_protocol;
+        set_real_ip_from 0.0.0.0/0;
+
        ssl_certificate /etc/nginx/certs/server.crt;
        ssl_certificate_key /etc/nginx/certs/server.key;