fix(ci): run smoke on Compose network (#1)
This commit is contained in:
@@ -112,7 +112,11 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
secret="deploy/compose/secrets/signing-key"
|
||||
compose_network=""
|
||||
cleanup() {
|
||||
if [[ -n "$compose_network" ]]; then
|
||||
docker network disconnect "$compose_network" "$HOSTNAME" >/dev/null 2>&1 || true
|
||||
fi
|
||||
RENDEZVOUS_UID=1654 RENDEZVOUS_GID=1654 RENDEZVOUS_IMAGE="git.finalfactory.de/heikyu/rendezvous:${RENDEZVOUS_VERSION}" \
|
||||
docker compose -f deploy/compose/compose.yaml down --volumes >/dev/null 2>&1 || true
|
||||
rm -f "$secret"
|
||||
@@ -126,8 +130,6 @@ jobs:
|
||||
port_suffix="$(( ${GITHUB_RUN_ID:-$$} % 10000 ))"
|
||||
export RENDEZVOUS_HTTP_HOST_PORT="$(( 20000 + port_suffix ))"
|
||||
export RENDEZVOUS_UDP_HOST_PORT="$(( 40000 + port_suffix ))"
|
||||
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')"
|
||||
@@ -137,9 +139,11 @@ jobs:
|
||||
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"
|
||||
compose_network="$(docker inspect "$container_id" | jq -er \
|
||||
'.[0].NetworkSettings.Networks | keys[0]')"
|
||||
docker network connect "$compose_network" "$HOSTNAME"
|
||||
service_ip="$(docker inspect "$container_id" | jq -er \
|
||||
--arg network "$runner_network" \
|
||||
--arg network "$compose_network" \
|
||||
'.[0].NetworkSettings.Networks[$network].IPAddress')"
|
||||
export RENDEZVOUS_SMOKE_HTTP_URL="http://${service_ip}:8080/"
|
||||
export RENDEZVOUS_SMOKE_UDP_ENDPOINT="${service_ip}:9050"
|
||||
|
||||
Reference in New Issue
Block a user