fix(ci): join service to runner network (#1)

2026-07-17 01:36:47 +02:00
parent 1bca034a52
commit 41be7fbce5
5 changed files with 25 additions and 17 deletions
@@ -126,11 +126,8 @@ jobs:
          port_suffix="$(( ${GITHUB_RUN_ID:-$$} % 10000 ))"
          export RENDEZVOUS_HTTP_HOST_PORT="$(( 20000 + port_suffix ))"
          export RENDEZVOUS_UDP_HOST_PORT="$(( 40000 + port_suffix ))"
-          export RENDEZVOUS_HTTP_BIND_ADDRESS="0.0.0.0"
-          runner_host_gateway="$(docker inspect "$HOSTNAME" | jq -er \
-            '.[0].NetworkSettings.Networks | to_entries[0].value.Gateway')"
-          export RENDEZVOUS_SMOKE_HTTP_URL="http://${runner_host_gateway}:${RENDEZVOUS_HTTP_HOST_PORT}/"
-          export RENDEZVOUS_SMOKE_UDP_ENDPOINT="${runner_host_gateway}:${RENDEZVOUS_UDP_HOST_PORT}"
+          runner_network="$(docker inspect "$HOSTNAME" | jq -er \
+            '.[0].NetworkSettings.Networks | keys[0]')"
          runner_workspace_source="$(docker inspect "$HOSTNAME" | jq -er \
            --arg destination "$GITHUB_WORKSPACE" \
            '.[0].Mounts[] | select(.Destination == $destination) | .Source')"
@@ -138,6 +135,14 @@ jobs:
          export RENDEZVOUS_SECRET_SOURCE="$runner_workspace_source/deploy/compose/secrets/signing-key"
          export RENDEZVOUS_IMAGE="git.finalfactory.de/heikyu/rendezvous:${RENDEZVOUS_VERSION}"
          docker compose -f deploy/compose/compose.yaml up --detach --no-build
+          container_id="$(docker compose -f deploy/compose/compose.yaml ps -q rendezvous)"
+          test -n "$container_id"
+          docker network connect "$runner_network" "$container_id"
+          service_ip="$(docker inspect "$container_id" | jq -er \
+            --arg network "$runner_network" \
+            '.[0].NetworkSettings.Networks[$network].IPAddress')"
+          export RENDEZVOUS_SMOKE_HTTP_URL="http://${service_ip}:8080/"
+          export RENDEZVOUS_SMOKE_UDP_ENDPOINT="${service_ip}:9050"
          for attempt in {1..100}; do
            curl --fail --silent "${RENDEZVOUS_SMOKE_HTTP_URL%/}/health/ready" >/dev/null 2>&1 && break
            if (( attempt == 100 )); then