mirror of https://github.com/bitcoin/bitcoin.git
ci: add one more routable address to the VMs (docker containers)
Also explicitly specify which addresses from the docker network to assign to the VM. With `1.1.1.5` and `1111:1111::5` set on the machine, the tests `feature_bind_port_discover.py` and `feature_bind_port_externalip.py` will run.
This commit is contained in:
parent
7cd5a6a266
commit
9b30b0bea8
|
@ -69,6 +69,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
|||
fi
|
||||
|
||||
docker network create --ipv6 --subnet 1111:1111::/112 ci-ip6net || true
|
||||
docker network create --subnet 1.1.1.0/24 ci-ip4net || true
|
||||
|
||||
if [ -n "${RESTART_CI_DOCKER_BEFORE_RUN}" ] ; then
|
||||
echo "Restart docker before run to stop and clear all containers started with --rm"
|
||||
|
@ -96,8 +97,10 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
|||
--env-file /tmp/env-$USER-$CONTAINER_NAME \
|
||||
--name "$CONTAINER_NAME" \
|
||||
--network ci-ip6net \
|
||||
--ip6=1111:1111::5 \
|
||||
--platform="${CI_IMAGE_PLATFORM}" \
|
||||
"$CONTAINER_NAME")
|
||||
docker network connect --ip=1.1.1.5 ci-ip4net "$CI_CONTAINER_ID"
|
||||
export CI_CONTAINER_ID
|
||||
export CI_EXEC_CMD_PREFIX="docker exec ${CI_CONTAINER_ID}"
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue