HeiKyu/Rendezvous
2
0
Fork 0
Code Issues 27 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ci): join service to runner network (#1)
quality-gate / quality (push) Successful in 2m37s
Details
quality-gate / container (push) Failing after 1m40s
Details

Browse Source
This commit is contained in:
KyuubiYoru
2026-07-17 01:36:47 +02:00
parent 1bca034a52
commit 41be7fbce5
5 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/ci.yml
+8 -5
View File
@@ -158,11 +158,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')"
@@ -174,6 +171,12 @@ jobs:
docker compose -f "$compose_file" up --no-build --detach
container_id="$(docker compose -f "$compose_file" 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"
test "$(docker inspect --format '{{.Config.User}}' "$container_id")" = "1654:1654"
test "$(docker inspect --format '{{.HostConfig.ReadonlyRootfs}}' "$container_id")" = "true"
test "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/app/appsettings.Production.json"}}{{.RW}}{{end}}{{end}}' "$container_id")" = "false"
.gitea/workflows/release.yml
+10 -5
View File
@@ -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
deploy/compose/compose.yaml
+1 -1
View File
@@ -33,5 +33,5 @@ services:
- ${RENDEZVOUS_CONFIG_SOURCE:-./appsettings.Production.json}:/app/appsettings.Production.json:ro
- ${RENDEZVOUS_SECRET_SOURCE:-./secrets/signing-key}:/run/secrets/rendezvous-signing-key:ro
ports:
- "${RENDEZVOUS_HTTP_BIND_ADDRESS:-127.0.0.1}:${RENDEZVOUS_HTTP_HOST_PORT:-8080}:8080/tcp"
- "127.0.0.1:${RENDEZVOUS_HTTP_HOST_PORT:-8080}:8080/tcp"
- "${RENDEZVOUS_UDP_HOST_PORT:-9050}:9050/udp"
docs/deployment/linux.md
+3 -3
View File
@@ -49,9 +49,9 @@ Compose, then point `RENDEZVOUS_SMOKE_HTTP_URL` and
and production-advertised service ports remain 8080/9050. Sibling-container CI
runners may also set `RENDEZVOUS_CONFIG_SOURCE` and
`RENDEZVOUS_SECRET_SOURCE` to host-visible absolute bind-source paths; local
operators should normally keep the checked-in relative defaults. Those runners
may set `RENDEZVOUS_HTTP_BIND_ADDRESS=0.0.0.0` and target their Docker host
gateway; do not widen the default loopback HTTP binding on an ordinary host.
operators should normally keep the checked-in relative defaults. CI attaches
the service to the ephemeral job network for smoke traffic; it does not widen
the default loopback HTTP publication.
`deploy/compose/appsettings.Production.json` is a local/private-bridge smoke
profile, not an Internet template: TCP is published only on host loopback, the
tests/FinalFactory.Rendezvous.Tests/Release/ReleaseCompatibilityTests.cs
+3 -3
View File
@@ -169,7 +169,6 @@ public sealed class ReleaseCompatibilityTests
{
string root = FindRepositoryRoot();
string compose = File.ReadAllText(Path.Combine(root, "deploy/compose/compose.yaml"));
Assert.Contains("${RENDEZVOUS_HTTP_BIND_ADDRESS:-127.0.0.1}", compose, StringComparison.Ordinal);
Assert.Contains("${RENDEZVOUS_HTTP_HOST_PORT:-8080}:8080/tcp", compose, StringComparison.Ordinal);
Assert.Contains("${RENDEZVOUS_UDP_HOST_PORT:-9050}:9050/udp", compose, StringComparison.Ordinal);
Assert.Contains("${RENDEZVOUS_CONFIG_SOURCE:-./appsettings.Production.json}", compose, StringComparison.Ordinal);
@@ -179,8 +178,9 @@ public sealed class ReleaseCompatibilityTests
{
string workflow = File.ReadAllText(Path.Combine(root, ".gitea/workflows", workflowName));
Assert.Contains("GITHUB_RUN_ID", workflow, StringComparison.Ordinal);
Assert.Contains("runner_host_gateway", workflow, StringComparison.Ordinal);
Assert.Contains("RENDEZVOUS_HTTP_BIND_ADDRESS", workflow, StringComparison.Ordinal);
Assert.Contains("runner_network", workflow, StringComparison.Ordinal);
Assert.Contains("docker network connect", workflow, StringComparison.Ordinal);
Assert.Contains("service_ip", workflow, StringComparison.Ordinal);
Assert.Contains("RENDEZVOUS_HTTP_HOST_PORT", workflow, StringComparison.Ordinal);
Assert.Contains("RENDEZVOUS_UDP_HOST_PORT", workflow, StringComparison.Ordinal);
Assert.Contains("RENDEZVOUS_SMOKE_HTTP_URL", workflow, StringComparison.Ordinal);