From 0138064bccfb3ab6ba4f7e0ad9e1f362ae806fad Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Thu, 28 May 2026 23:23:23 +0200 Subject: [PATCH] fix(ci): switch network subnet mapping to 10.199.x.x space to guarantee no overlaps on host --- .gitea/workflows/deploy.yml | 10 +++++----- docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ba7b19df6..8e0ae9b36 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -307,16 +307,16 @@ jobs: GATEKEEPER_ORIGIN="${NEXT_PUBLIC_BASE_URL}/gatekeeper" if [[ "$TARGET" == "production" ]]; then - INTERNAL_SUBNET="192.168.220.0/24" + INTERNAL_SUBNET="10.199.10.0/24" elif [[ "$TARGET" == "testing" ]]; then - INTERNAL_SUBNET="192.168.221.0/24" + INTERNAL_SUBNET="10.199.11.0/24" elif [[ "$TARGET" == "staging" ]]; then - INTERNAL_SUBNET="192.168.222.0/24" + INTERNAL_SUBNET="10.199.12.0/24" else HEX_SHA="${{ needs.prepare.outputs.short_sha }}" DEC_SHA=$((16#$HEX_SHA)) - SUBNET_NUM=$(( 10 + (DEC_SHA % 200) )) - INTERNAL_SUBNET="192.168.${SUBNET_NUM}.0/24" + SUBNET_NUM=$(( 13 + (DEC_SHA % 230) )) + INTERNAL_SUBNET="10.199.${SUBNET_NUM}.0/24" fi { diff --git a/docker-compose.yml b/docker-compose.yml index 3482d860f..32ee943ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,7 +112,7 @@ networks: name: ${PROJECT_NAME:-e-tib}-internal ipam: config: - - subnet: ${INTERNAL_SUBNET:-192.168.219.0/24} + - subnet: ${INTERNAL_SUBNET:-10.199.9.0/24} infra: external: true