From 7121747d35ce200e295d816df194c32e4f342f0c Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:17:40 +0100 Subject: [PATCH 01/14] feat: Add pre-production deployment stage with E2E tests, a dedicated environment file, and update production deployment dependency. --- .gitea/workflows/workflow.yaml | 40 +++++++++++++++++++++++++++++++++- preprod.env | 9 ++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 preprod.env diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index a30f514..79d2d07 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -12,6 +12,7 @@ env: REMOTE_DEPLOY_PATH: /var/app/traefik/test REMOTE_PROD_PATH: /var/app/traefik/prod REMOTE_STAGING_PATH: /var/app/traefik/staging + REMOTE_PREPROD_PATH: /var/app/traefik/preprod # --- SECRETS --- SSH_HOST: ${{ secrets.SSH_HOST }} @@ -93,13 +94,50 @@ jobs: cd ${{ env.REMOTE_STAGING_PATH }} docker compose --env-file staging.env -f docker-compose.yaml up -d --build --remove-orphans --wait + # ------------------------------------------------------------------ + # STAGE 3.5: DEPLOY PRE-PROD + # ------------------------------------------------------------------ + deploy_preprod: + name: Deploy (Pre-Prod) + runs-on: ubuntu-latest + needs: [deploy_staging] + if: github.ref == 'refs/heads/test_preprod' + steps: + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 + + - name: Deploy via Rsync & Docker + uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 + env: + SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }} + REMOTE_HOST: ${{ env.SSH_HOST }} + REMOTE_USER: ${{ env.SSH_USER }} + REMOTE_PORT: ${{ env.SSH_PORT }} + TARGET: ${{ env.REMOTE_PREPROD_PATH }} + EXCLUDE: ".git/, .github/" + SCRIPT_BEFORE: | + mkdir -p ${{ env.REMOTE_PREPROD_PATH }} + SCRIPT_AFTER: | + set -e + cd ${{ env.REMOTE_PREPROD_PATH }} + docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans --wait + + # Run E2E Tests + echo "Running E2E tests..." + # Create venv to avoid polluting system python + python3 -m venv .venv + . .venv/bin/activate + pip install -r tests/e2e/requirements.txt + pytest tests/e2e/ + + docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans + # ------------------------------------------------------------------ # STAGE 4: DEPLOY PRODUCTION # ------------------------------------------------------------------ deploy_prod: name: Deploy (Production) runs-on: ubuntu-latest - needs: [deploy_staging] + needs: [deploy_preprod] if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 diff --git a/preprod.env b/preprod.env new file mode 100644 index 0000000..38d0670 --- /dev/null +++ b/preprod.env @@ -0,0 +1,9 @@ +PORT=8081 +HTTPS_PORT=447 +ENV=preprod +NETWORK_NAME=proxy +CERTBOT_CA_RESOLVER=https://acme-staging-v02.api.letsencrypt.org/directory +DOMAIN=preprod.kovagoadi.hu +ACME_BYPASS=false +TRAEFIK_LEGACY_OPT="--providers.file.directory=/etc/traefik" +CI=true \ No newline at end of file -- 2.49.1 From fc2e0cb44e5853578ee8cb4b461d92bf865bb1b3 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:20:17 +0100 Subject: [PATCH 02/14] Uncommented needs --- .gitea/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 79d2d07..f74cb3a 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -100,7 +100,7 @@ jobs: deploy_preprod: name: Deploy (Pre-Prod) runs-on: ubuntu-latest - needs: [deploy_staging] + # needs: [deploy_staging] if: github.ref == 'refs/heads/test_preprod' steps: - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 -- 2.49.1 From 44d00930698dbb2a504f21218c1cd0a8f974ba3e Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:21:47 +0100 Subject: [PATCH 03/14] ci: Comment out the branch condition for the pre-production deployment workflow. --- .gitea/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index f74cb3a..275a491 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -101,7 +101,7 @@ jobs: name: Deploy (Pre-Prod) runs-on: ubuntu-latest # needs: [deploy_staging] - if: github.ref == 'refs/heads/test_preprod' + # if: github.ref == 'refs/heads/test_preprod' steps: - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 -- 2.49.1 From de03b9625c4cf0f34d8cdb94945ef5927e3c3a3d Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:26:30 +0100 Subject: [PATCH 04/14] Added sourcing --- .gitea/workflows/workflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 275a491..05bf29d 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -124,6 +124,7 @@ jobs: # Run E2E Tests echo "Running E2E tests..." # Create venv to avoid polluting system python + source preprod.env python3 -m venv .venv . .venv/bin/activate pip install -r tests/e2e/requirements.txt -- 2.49.1 From f60d9bb66cb8ebdb6cb92c15af6bf4b43b418ed5 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:30:00 +0100 Subject: [PATCH 05/14] Moved sourcing --- .gitea/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 05bf29d..26e722c 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -124,9 +124,9 @@ jobs: # Run E2E Tests echo "Running E2E tests..." # Create venv to avoid polluting system python - source preprod.env python3 -m venv .venv . .venv/bin/activate + source preprod.env pip install -r tests/e2e/requirements.txt pytest tests/e2e/ -- 2.49.1 From c2ef3a3160dfd0a0d4536c37286919a6efc69d5f Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:36:09 +0100 Subject: [PATCH 06/14] test: Update default `PORT` and `HTTPS_PORT` values for E2E tests. --- tests/e2e/test_traefik.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/test_traefik.py b/tests/e2e/test_traefik.py index b8ab1db..2a37052 100644 --- a/tests/e2e/test_traefik.py +++ b/tests/e2e/test_traefik.py @@ -4,8 +4,8 @@ import os # Configuration DOMAIN = os.getenv("DOMAIN", "dev.kovagoadi.hu") -PORT = os.getenv("PORT", "898") -HTTPS_PORT = os.getenv("HTTPS_PORT", "446") +PORT = os.getenv("PORT", "10000") +HTTPS_PORT = os.getenv("HTTPS_PORT", "10001") BASE_URL = f"http://127.0.0.1:{PORT}" HTTPS_BASE_URL = f"https://127.0.0.1:{HTTPS_PORT}" -- 2.49.1 From 5920529de7618cc38dd0e06077c9ab7033186927 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:40:41 +0100 Subject: [PATCH 07/14] Revert "test: Update default `PORT` and `HTTPS_PORT` values for E2E tests." This reverts commit c2ef3a3160dfd0a0d4536c37286919a6efc69d5f. --- tests/e2e/test_traefik.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/test_traefik.py b/tests/e2e/test_traefik.py index 2a37052..b8ab1db 100644 --- a/tests/e2e/test_traefik.py +++ b/tests/e2e/test_traefik.py @@ -4,8 +4,8 @@ import os # Configuration DOMAIN = os.getenv("DOMAIN", "dev.kovagoadi.hu") -PORT = os.getenv("PORT", "10000") -HTTPS_PORT = os.getenv("HTTPS_PORT", "10001") +PORT = os.getenv("PORT", "898") +HTTPS_PORT = os.getenv("HTTPS_PORT", "446") BASE_URL = f"http://127.0.0.1:{PORT}" HTTPS_BASE_URL = f"https://127.0.0.1:{HTTPS_PORT}" -- 2.49.1 From d415f0d82f3a1988ececbbd03d29feb737001a4f Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:42:20 +0100 Subject: [PATCH 08/14] Undid workflow changes --- .gitea/workflows/workflow.yaml | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 26e722c..4d3eff9 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -12,7 +12,7 @@ env: REMOTE_DEPLOY_PATH: /var/app/traefik/test REMOTE_PROD_PATH: /var/app/traefik/prod REMOTE_STAGING_PATH: /var/app/traefik/staging - REMOTE_PREPROD_PATH: /var/app/traefik/preprod + # REMOTE_PREPROD_PATH: /var/app/traefik/preprod # --- SECRETS --- SSH_HOST: ${{ secrets.SSH_HOST }} @@ -97,40 +97,40 @@ jobs: # ------------------------------------------------------------------ # STAGE 3.5: DEPLOY PRE-PROD # ------------------------------------------------------------------ - deploy_preprod: - name: Deploy (Pre-Prod) - runs-on: ubuntu-latest - # needs: [deploy_staging] - # if: github.ref == 'refs/heads/test_preprod' - steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 + # deploy_preprod: + # name: Deploy (Pre-Prod) + # runs-on: ubuntu-latest + # # needs: [deploy_staging] + # # if: github.ref == 'refs/heads/test_preprod' + # steps: + # - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 - - name: Deploy via Rsync & Docker - uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 - env: - SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }} - REMOTE_HOST: ${{ env.SSH_HOST }} - REMOTE_USER: ${{ env.SSH_USER }} - REMOTE_PORT: ${{ env.SSH_PORT }} - TARGET: ${{ env.REMOTE_PREPROD_PATH }} - EXCLUDE: ".git/, .github/" - SCRIPT_BEFORE: | - mkdir -p ${{ env.REMOTE_PREPROD_PATH }} - SCRIPT_AFTER: | - set -e - cd ${{ env.REMOTE_PREPROD_PATH }} - docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans --wait + # - name: Deploy via Rsync & Docker + # uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 + # env: + # SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }} + # REMOTE_HOST: ${{ env.SSH_HOST }} + # REMOTE_USER: ${{ env.SSH_USER }} + # REMOTE_PORT: ${{ env.SSH_PORT }} + # TARGET: ${{ env.REMOTE_PREPROD_PATH }} + # EXCLUDE: ".git/, .github/" + # SCRIPT_BEFORE: | + # mkdir -p ${{ env.REMOTE_PREPROD_PATH }} + # SCRIPT_AFTER: | + # set -e + # cd ${{ env.REMOTE_PREPROD_PATH }} + # docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans --wait - # Run E2E Tests - echo "Running E2E tests..." - # Create venv to avoid polluting system python - python3 -m venv .venv - . .venv/bin/activate - source preprod.env - pip install -r tests/e2e/requirements.txt - pytest tests/e2e/ + # # Run E2E Tests + # echo "Running E2E tests..." + # # Create venv to avoid polluting system python + # python3 -m venv .venv + # . .venv/bin/activate + # source preprod.env + # pip install -r tests/e2e/requirements.txt + # pytest tests/e2e/ - docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans + # docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans # ------------------------------------------------------------------ # STAGE 4: DEPLOY PRODUCTION @@ -138,7 +138,7 @@ jobs: deploy_prod: name: Deploy (Production) runs-on: ubuntu-latest - needs: [deploy_preprod] + needs: [deploy_staging] if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 -- 2.49.1 From f5dc53dc968db72903c0f2f6c6dbf9af5e63dc62 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:47:55 +0100 Subject: [PATCH 09/14] Revert "Undid workflow changes" This reverts commit d415f0d82f3a1988ececbbd03d29feb737001a4f. --- .gitea/workflows/workflow.yaml | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 4d3eff9..26e722c 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -12,7 +12,7 @@ env: REMOTE_DEPLOY_PATH: /var/app/traefik/test REMOTE_PROD_PATH: /var/app/traefik/prod REMOTE_STAGING_PATH: /var/app/traefik/staging - # REMOTE_PREPROD_PATH: /var/app/traefik/preprod + REMOTE_PREPROD_PATH: /var/app/traefik/preprod # --- SECRETS --- SSH_HOST: ${{ secrets.SSH_HOST }} @@ -97,40 +97,40 @@ jobs: # ------------------------------------------------------------------ # STAGE 3.5: DEPLOY PRE-PROD # ------------------------------------------------------------------ - # deploy_preprod: - # name: Deploy (Pre-Prod) - # runs-on: ubuntu-latest - # # needs: [deploy_staging] - # # if: github.ref == 'refs/heads/test_preprod' - # steps: - # - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 + deploy_preprod: + name: Deploy (Pre-Prod) + runs-on: ubuntu-latest + # needs: [deploy_staging] + # if: github.ref == 'refs/heads/test_preprod' + steps: + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 - # - name: Deploy via Rsync & Docker - # uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 - # env: - # SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }} - # REMOTE_HOST: ${{ env.SSH_HOST }} - # REMOTE_USER: ${{ env.SSH_USER }} - # REMOTE_PORT: ${{ env.SSH_PORT }} - # TARGET: ${{ env.REMOTE_PREPROD_PATH }} - # EXCLUDE: ".git/, .github/" - # SCRIPT_BEFORE: | - # mkdir -p ${{ env.REMOTE_PREPROD_PATH }} - # SCRIPT_AFTER: | - # set -e - # cd ${{ env.REMOTE_PREPROD_PATH }} - # docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans --wait + - name: Deploy via Rsync & Docker + uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 + env: + SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }} + REMOTE_HOST: ${{ env.SSH_HOST }} + REMOTE_USER: ${{ env.SSH_USER }} + REMOTE_PORT: ${{ env.SSH_PORT }} + TARGET: ${{ env.REMOTE_PREPROD_PATH }} + EXCLUDE: ".git/, .github/" + SCRIPT_BEFORE: | + mkdir -p ${{ env.REMOTE_PREPROD_PATH }} + SCRIPT_AFTER: | + set -e + cd ${{ env.REMOTE_PREPROD_PATH }} + docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans --wait - # # Run E2E Tests - # echo "Running E2E tests..." - # # Create venv to avoid polluting system python - # python3 -m venv .venv - # . .venv/bin/activate - # source preprod.env - # pip install -r tests/e2e/requirements.txt - # pytest tests/e2e/ + # Run E2E Tests + echo "Running E2E tests..." + # Create venv to avoid polluting system python + python3 -m venv .venv + . .venv/bin/activate + source preprod.env + pip install -r tests/e2e/requirements.txt + pytest tests/e2e/ - # docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans + docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans # ------------------------------------------------------------------ # STAGE 4: DEPLOY PRODUCTION @@ -138,7 +138,7 @@ jobs: deploy_prod: name: Deploy (Production) runs-on: ubuntu-latest - needs: [deploy_staging] + needs: [deploy_preprod] if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 -- 2.49.1 From 50aa276c372950959298b2a7b67bf6a56b0a9144 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:48:18 +0100 Subject: [PATCH 10/14] Reapply "test: Update default `PORT` and `HTTPS_PORT` values for E2E tests." This reverts commit 5920529de7618cc38dd0e06077c9ab7033186927. --- tests/e2e/test_traefik.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/test_traefik.py b/tests/e2e/test_traefik.py index b8ab1db..2a37052 100644 --- a/tests/e2e/test_traefik.py +++ b/tests/e2e/test_traefik.py @@ -4,8 +4,8 @@ import os # Configuration DOMAIN = os.getenv("DOMAIN", "dev.kovagoadi.hu") -PORT = os.getenv("PORT", "898") -HTTPS_PORT = os.getenv("HTTPS_PORT", "446") +PORT = os.getenv("PORT", "10000") +HTTPS_PORT = os.getenv("HTTPS_PORT", "10001") BASE_URL = f"http://127.0.0.1:{PORT}" HTTPS_BASE_URL = f"https://127.0.0.1:{HTTPS_PORT}" -- 2.49.1 From 01c5229f26e6f74da09b958298ced15e1bb4e381 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:55:03 +0100 Subject: [PATCH 11/14] refactor: Update CI workflow to ensure environment variables are loaded for E2E tests and add conditional cleanup. --- .gitea/workflows/workflow.yaml | 40 +++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 26e722c..2105173 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -121,16 +121,40 @@ jobs: cd ${{ env.REMOTE_PREPROD_PATH }} docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans --wait - # Run E2E Tests + - name: Run E2E Tests + uses: appleboy/ssh-action@823bd89e131d8d508129f9443cad5855e9ba96f0 # v1.2.4 + with: + host: ${{ env.SSH_HOST }} + username: ${{ env.SSH_USER }} + key: ${{ env.SSH_PRIVATE_KEY }} + port: ${{ env.SSH_PORT }} + script: | + set -e + cd ${{ env.REMOTE_PREPROD_PATH }} + echo "Running E2E tests..." - # Create venv to avoid polluting system python python3 -m venv .venv . .venv/bin/activate - source preprod.env + + # Export env vars + set -a + . preprod.env + set +a + pip install -r tests/e2e/requirements.txt - pytest tests/e2e/ - - docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans + + # Run tests + if pytest tests/e2e/; then + echo "Tests passed!" + # Cleanup on success + docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans + else + echo "Tests failed!" + # Optional: Cleanup on failure? Or keep for debugging? + # User's previous script had it after, implying it runs if pytest succeeds (due to set -e). + # I will fail the step. + exit 1 + fi # ------------------------------------------------------------------ # STAGE 4: DEPLOY PRODUCTION @@ -165,6 +189,10 @@ jobs: # Create venv to avoid polluting system python python3 -m venv .venv . .venv/bin/activate + # Export env vars so pytest can see them + set -a + . prod.env + set +a pip install -r tests/e2e/requirements.txt pytest tests/e2e/ -- 2.49.1 From 1c9be2d57db4855c3505c0b25a3aede5f1fb6963 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 22:03:44 +0100 Subject: [PATCH 12/14] Use preprod.env --- tests/e2e/test_traefik.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/test_traefik.py b/tests/e2e/test_traefik.py index 2a37052..2e85062 100644 --- a/tests/e2e/test_traefik.py +++ b/tests/e2e/test_traefik.py @@ -88,7 +88,7 @@ def mock_webserver(): # We need to recreate the container to pick up extra_hosts changes try: - subprocess.run(["docker-compose", "--env-file", "dev.env", "up", "-d", "--force-recreate", "--no-deps", "traefik"], env=env, check=True, capture_output=True, text=True) + subprocess.run(["docker-compose", "--env-file", "preprod.env", "up", "-d", "--force-recreate", "--no-deps", "traefik"], env=env, check=True, capture_output=True, text=True) except subprocess.CalledProcessError as e: print(f"Docker Compose STDOUT: {e.stdout}") print(f"Docker Compose STDERR: {e.stderr}") @@ -104,7 +104,7 @@ def mock_webserver(): subprocess.run(["docker", "stop", mock["name"]], capture_output=True) # Restore Traefik to default (optional) - subprocess.run(["docker-compose", "--env-file", "dev.env", "up", "-d", "--force-recreate", "--no-deps", "traefik"], check=True) + subprocess.run(["docker-compose", "--env-file", "preprod.env", "up", "-d", "--force-recreate", "--no-deps", "traefik"], check=True) def test_whoami_http_reachable(): """Verify that the whoami service is reachable via HTTP.""" -- 2.49.1 From ef6cf2999b8d7eae9ee5fd04421ed646ddfe7f5f Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 22:23:36 +0100 Subject: [PATCH 13/14] Test domain --- tests/e2e/test_traefik.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/test_traefik.py b/tests/e2e/test_traefik.py index 2e85062..49f086b 100644 --- a/tests/e2e/test_traefik.py +++ b/tests/e2e/test_traefik.py @@ -3,7 +3,7 @@ import requests import os # Configuration -DOMAIN = os.getenv("DOMAIN", "dev.kovagoadi.hu") +DOMAIN = os.getenv("DOMAIN", "asdasd.kovagoadi.hu") PORT = os.getenv("PORT", "10000") HTTPS_PORT = os.getenv("HTTPS_PORT", "10001") -- 2.49.1 From af6e89274db9e0194373b408d7c8bafc943dc128 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 22:26:05 +0100 Subject: [PATCH 14/14] Added preprod rules --- preprod/forward-to-legacy-nginx.yaml | 47 ++++++++++++++++++++++++++++ preprod/route-to-staging-dev.yaml | 33 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 preprod/forward-to-legacy-nginx.yaml create mode 100644 preprod/route-to-staging-dev.yaml diff --git a/preprod/forward-to-legacy-nginx.yaml b/preprod/forward-to-legacy-nginx.yaml new file mode 100644 index 0000000..4da1e72 --- /dev/null +++ b/preprod/forward-to-legacy-nginx.yaml @@ -0,0 +1,47 @@ +# ./traefik/forward-to-legacy-nginx.yaml + +tcp: + routers: + # Router for HTTPS (Passthrough) + nginx-legacy-router-secure: + rule: "HostSNI(`*`)" + service: nginx-legacy-service-secure + # Passthrough must be true for SSL to reach Nginx encrypted + tls: + passthrough: true + priority: 10 + entryPoints: + - "https" + + services: + # Service defining the external IP + nginx-legacy-service-secure: + loadBalancer: + servers: + # This is the actual external IP and Port of your Nginx + - address: "webserver:443" + +http: + routers: + # 1. TRAEFIK-MANAGED ACME HANDLER (Removed manual router) + traefik-acme-handler: + rule: "Host(`test-whoami.kovagoadi.hu`) && PathPrefix(`/.well-known/acme-challenge/`)" + entryPoints: + - "web" + service: "acme-http@internal" # This is the internal service name + priority: 1000 # High priority to ensure it wins + + # 2. THE HTTP CATCH-ALL (Sends other ACME and HTTP to Nginx) + nginx-legacy-router: + rule: "HostRegexp(`^.+$`)" + service: nginx-legacy-service + # Low priority ensures specific containers are handled first, but before the default acme-handler + priority: 90 + entryPoints: + - "web" + + services: + nginx-legacy-service: + loadBalancer: + servers: + - url: "http://webserver:80" \ No newline at end of file diff --git a/preprod/route-to-staging-dev.yaml b/preprod/route-to-staging-dev.yaml new file mode 100644 index 0000000..fd12671 --- /dev/null +++ b/preprod/route-to-staging-dev.yaml @@ -0,0 +1,33 @@ +http: + routers: + # Router for HTTP (Port 80) + staging: + rule: "HostRegexp(`^.+\\.staging\\.kovagoadi\\.hu$`) || HostRegexp(`^.+\\.dev\\.kovagoadi\\.hu$`)" + entryPoints: + - "web" + service: "dev-staging" + priority: 1000 + services: + dev-staging: + loadBalancer: + servers: + - url: "http://staging:8080" + +tcp: + routers: + # Router for HTTPS (Passthrough) + dev-staging-secure: + rule: "HostSNIRegexp(`^.+\\.staging\\.kovagoadi\\.hu$`) || HostSNIRegexp(`^.+\\.dev\\.kovagoadi\\.hu$`)" + service: "dev-staging-secure" + # Passthrough must be true for SSL to reach Nginx encrypted + tls: + passthrough: true + priority: 1000 + entryPoints: + - "https" + services: + dev-staging-secure: + loadBalancer: + servers: + # Note: Ensure Traefik trusts the cert at .85 or set insecureSkipVerify + - address: "staging:445" \ No newline at end of file -- 2.49.1