osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity

Enable IPv6 in docker networking 

We previously only allocated IPv4 sub-nets to the network segments
created with 'docker network'.  Let's fix that by assigning both
IPv4 and IPv6 address ranges to each docker network.

Related: OS#4700
Change-Id: I8802208fddcce1ffa57e5626575d23d02b320d99
This commit is contained in:
Harald Welte 2020-08-12 12:26:29 +02:00 committed by laforge
parent 7b5248b464
commit 306a51dd30
21 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins-common.sh
View File

@ -87,8 +87,10 @@ network_create() {
network_clean
network_remove
fi
SUB4="172.18.$NET.0/24"
SUB6="fd02:db8:$NET::/64"
echo Creating network $NET_NAME
docker network create --internal --subnet $NET $NET_NAME
docker network create --internal --subnet $SUB4 --ipv6 --subnet $SUB6 $NET_NAME
}
network_remove() {

2
nplab-m3ua-test/jenkins.sh
View File

@ -15,7 +15,7 @@ cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/
mkdir $VOL_BASE_DIR/stp
cp osmo-stp.cfg $VOL_BASE_DIR/stp/
network_create 172.18.7.0/24
network_create 7
# start container with STP in background
docker run --rm \

2
nplab-sua-test/jenkins.sh
View File

@ -15,7 +15,7 @@ cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/
mkdir $VOL_BASE_DIR/stp
cp osmo-stp.cfg $VOL_BASE_DIR/stp/
network_create 172.18.6.0/24
network_create 6
# start container with STP in background
docker run --rm \

2
osmo-gsm-tester/jenkins.sh
View File

@ -58,7 +58,7 @@ docker_images_require \
"debian-stretch-jenkins" \
"osmo-gsm-tester"
network_create 172.18.50.0/24
network_create 50
mkdir $VOL_BASE_DIR/ogt-slave
cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/

2
scripts/regen_doc.sh
View File

@ -21,7 +21,7 @@ fi
docker_images_require \
"$NAME-$IMAGE_SUFFIX"
network_create 172.18.16.0/24
network_create 16
container_create() {
CONTAINERNAME=$1

2
ttcn3-bsc-test/jenkins-sccplite.sh
View File

@ -16,7 +16,7 @@ cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/
mkdir $VOL_BASE_DIR/bsc
cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
network_create 172.18.12.0/24
network_create 12
echo Starting container with BSC
docker run --rm \

2
ttcn3-bsc-test/jenkins.sh
View File

@ -24,7 +24,7 @@ if [ "$IMAGE_SUFFIX" = "latest" ]; then
cp pre-mscpool-osmo-bsc.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg
fi
network_create 172.18.2.0/24
network_create 2
echo Starting container with STP
docker run --rm \

2
ttcn3-bscnat-test/jenkins.sh
View File

@ -14,7 +14,7 @@ mkdir $VOL_BASE_DIR/bscnat
cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/
cp bscs.config $VOL_BASE_DIR/bscnat/
network_create 172.18.15.0/24
network_create 15
echo Starting container with BSCNAT
docker run --rm \

2
ttcn3-bts-test/jenkins.sh
View File

@ -101,7 +101,7 @@ start_testsuite() {
$REPO_USER/ttcn3-bts-test
}
network_create 172.18.9.0/24
network_create 9
mkdir $VOL_BASE_DIR/bts-tester
mkdir $VOL_BASE_DIR/bts-tester/unix

2
ttcn3-ggsn-test/jenkins.sh
View File

@ -12,7 +12,7 @@ cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/
mkdir $VOL_BASE_DIR/ggsn
cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/
network_create 172.18.3.0/24
network_create 3
# start container with ggsn in background
docker run --cap-add=NET_ADMIN \

2
ttcn3-hlr-test/jenkins.sh
View File

@ -6,7 +6,7 @@ docker_images_require \
"osmo-hlr-$IMAGE_SUFFIX" \
"ttcn3-hlr-test"
network_create 172.18.10.0/24
network_create 10
mkdir $VOL_BASE_DIR/hlr-tester
cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/

2
ttcn3-mgw-test/jenkins.sh
View File

@ -12,7 +12,7 @@ cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/
mkdir $VOL_BASE_DIR/mgw
cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/
network_create 172.18.4.0/24
network_create 4
# start container with mgw in background
docker run --rm \

2
ttcn3-msc-test/jenkins.sh
View File

@ -7,7 +7,7 @@ docker_images_require \
"osmo-msc-$IMAGE_SUFFIX" \
"ttcn3-msc-test"
network_create 172.18.1.0/24
network_create 1
mkdir $VOL_BASE_DIR/msc-tester
mkdir $VOL_BASE_DIR/msc-tester/unix

2
ttcn3-nitb-sysinfo/jenkins.sh
View File

@ -2,7 +2,7 @@
. ../jenkins-common.sh
network_create 172.18.5.0/24
network_create 5
# start container with nitb in background
docker volume rm nitb-vol

2
ttcn3-pcu-test/jenkins-sns.sh
View File

@ -6,7 +6,7 @@ docker_images_require \
"osmo-pcu-$IMAGE_SUFFIX" \
"ttcn3-pcu-test"
network_create 172.18.14.0/24
network_create 14
mkdir $VOL_BASE_DIR/pcu-tester
mkdir $VOL_BASE_DIR/pcu-tester/unix

2
ttcn3-pcu-test/jenkins.sh
View File

@ -6,7 +6,7 @@ docker_images_require \
"osmo-pcu-$IMAGE_SUFFIX" \
"ttcn3-pcu-test"
network_create 172.18.13.0/24
network_create 13
mkdir $VOL_BASE_DIR/pcu-tester
mkdir $VOL_BASE_DIR/pcu-tester/unix

2
ttcn3-remsim-test/jenkins.sh
View File

@ -56,7 +56,7 @@ start_testsuite() {
$REPO_USER/ttcn3-remsim-test
}
network_create 172.18.17.0/24
network_create 17
mkdir $VOL_BASE_DIR/remsim-tester

2
ttcn3-sccp-test/jenkins.sh
View File

@ -13,7 +13,7 @@ cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/
mkdir $VOL_BASE_DIR/sccp
cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/
network_create 172.18.22.0/24
network_create 22
echo Starting container with sccp_demo_user
docker run --rm \

2
ttcn3-sgsn-test/jenkins.sh
View File

@ -7,7 +7,7 @@ docker_images_require \
"osmo-sgsn-$IMAGE_SUFFIX" \
"ttcn3-sgsn-test"
network_create 172.18.8.0/24
network_create 8
mkdir $VOL_BASE_DIR/sgsn-tester
cp SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/

2
ttcn3-sip-test/jenkins.sh
View File

@ -6,7 +6,7 @@ docker_images_require \
"osmo-sip-$IMAGE_SUFFIX" \
"ttcn3-sip-test"
network_create 172.18.11.0/24
network_create 11
mkdir $VOL_BASE_DIR/sip-tester
mkdir $VOL_BASE_DIR/sip-tester/unix

2
ttcn3-stp-test/jenkins.sh
View File

@ -12,7 +12,7 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/
mkdir $VOL_BASE_DIR/stp
cp osmo-stp.cfg $VOL_BASE_DIR/stp/
network_create 172.18.19.0/24
network_create 19
echo Starting container with STP
docker run --rm \