<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/19572">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
daniel: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Enable IPv6 in docker networking<br><br>We previously only allocated IPv4 sub-nets to the network segments<br>created with 'docker network'. Let's fix that by assigning both<br>IPv4 and IPv6 address ranges to each docker network.<br><br>Related: OS#4700<br>Change-Id: I8802208fddcce1ffa57e5626575d23d02b320d99<br>---<br>M jenkins-common.sh<br>M nplab-m3ua-test/jenkins.sh<br>M nplab-sua-test/jenkins.sh<br>M osmo-gsm-tester/jenkins.sh<br>M scripts/regen_doc.sh<br>M ttcn3-bsc-test/jenkins-sccplite.sh<br>M ttcn3-bsc-test/jenkins.sh<br>M ttcn3-bscnat-test/jenkins.sh<br>M ttcn3-bts-test/jenkins.sh<br>M ttcn3-ggsn-test/jenkins.sh<br>M ttcn3-hlr-test/jenkins.sh<br>M ttcn3-mgw-test/jenkins.sh<br>M ttcn3-msc-test/jenkins.sh<br>M ttcn3-nitb-sysinfo/jenkins.sh<br>M ttcn3-pcu-test/jenkins-sns.sh<br>M ttcn3-pcu-test/jenkins.sh<br>M ttcn3-remsim-test/jenkins.sh<br>M ttcn3-sccp-test/jenkins.sh<br>M ttcn3-sgsn-test/jenkins.sh<br>M ttcn3-sip-test/jenkins.sh<br>M ttcn3-stp-test/jenkins.sh<br>21 files changed, 23 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index 64ec0bb..2993767 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -87,8 +87,10 @@</span><br><span> network_clean</span><br><span> network_remove</span><br><span> fi</span><br><span style="color: hsl(120, 100%, 40%);">+ SUB4="172.18.$NET.0/24"</span><br><span style="color: hsl(120, 100%, 40%);">+ SUB6="fd02:db8:$NET::/64"</span><br><span> echo Creating network $NET_NAME</span><br><span style="color: hsl(0, 100%, 40%);">- docker network create --internal --subnet $NET $NET_NAME</span><br><span style="color: hsl(120, 100%, 40%);">+ docker network create --internal --subnet $SUB4 --ipv6 --subnet $SUB6 $NET_NAME</span><br><span> }</span><br><span> </span><br><span> network_remove() {</span><br><span>diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh</span><br><span>index 4543b91..ac6a880 100755</span><br><span>--- a/nplab-m3ua-test/jenkins.sh</span><br><span>+++ b/nplab-m3ua-test/jenkins.sh</span><br><span>@@ -15,7 +15,7 @@</span><br><span> mkdir $VOL_BASE_DIR/stp</span><br><span> cp osmo-stp.cfg $VOL_BASE_DIR/stp/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.7.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 7</span><br><span> </span><br><span> # start container with STP in background</span><br><span> docker run --rm \</span><br><span>diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh</span><br><span>index 1d3111e..39d37bb 100755</span><br><span>--- a/nplab-sua-test/jenkins.sh</span><br><span>+++ b/nplab-sua-test/jenkins.sh</span><br><span>@@ -15,7 +15,7 @@</span><br><span> mkdir $VOL_BASE_DIR/stp</span><br><span> cp osmo-stp.cfg $VOL_BASE_DIR/stp/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.6.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 6</span><br><span> </span><br><span> # start container with STP in background</span><br><span> docker run --rm \</span><br><span>diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh</span><br><span>index 0973774..5066012 100755</span><br><span>--- a/osmo-gsm-tester/jenkins.sh</span><br><span>+++ b/osmo-gsm-tester/jenkins.sh</span><br><span>@@ -58,7 +58,7 @@</span><br><span> "debian-stretch-jenkins" \</span><br><span> "osmo-gsm-tester"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.50.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 50</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/ogt-slave</span><br><span> cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/</span><br><span>diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh</span><br><span>index ca540f9..cd3c560 100755</span><br><span>--- a/scripts/regen_doc.sh</span><br><span>+++ b/scripts/regen_doc.sh</span><br><span>@@ -21,7 +21,7 @@</span><br><span> docker_images_require \</span><br><span> "$NAME-$IMAGE_SUFFIX"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.16.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 16</span><br><span> </span><br><span> container_create() {</span><br><span> CONTAINERNAME=$1</span><br><span>diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>index f91e603..ee4417c 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>@@ -16,7 +16,7 @@</span><br><span> mkdir $VOL_BASE_DIR/bsc</span><br><span> cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.12.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 12</span><br><span> </span><br><span> echo Starting container with BSC</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh</span><br><span>index 11b9d2a..0218a8f 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins.sh</span><br><span>@@ -24,7 +24,7 @@</span><br><span> cp pre-mscpool-osmo-bsc.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.2.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 2</span><br><span> </span><br><span> echo Starting container with STP</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh</span><br><span>index 1d771eb..08d5be8 100755</span><br><span>--- a/ttcn3-bscnat-test/jenkins.sh</span><br><span>+++ b/ttcn3-bscnat-test/jenkins.sh</span><br><span>@@ -14,7 +14,7 @@</span><br><span> cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/</span><br><span> cp bscs.config $VOL_BASE_DIR/bscnat/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.15.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 15</span><br><span> </span><br><span> echo Starting container with BSCNAT</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index 6f37e54..3e61780 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -101,7 +101,7 @@</span><br><span> $REPO_USER/ttcn3-bts-test</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.9.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 9</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/bts-tester</span><br><span> mkdir $VOL_BASE_DIR/bts-tester/unix</span><br><span>diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh</span><br><span>index c950cc6..7e25a9b 100755</span><br><span>--- a/ttcn3-ggsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-ggsn-test/jenkins.sh</span><br><span>@@ -12,7 +12,7 @@</span><br><span> mkdir $VOL_BASE_DIR/ggsn</span><br><span> cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.3.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 3</span><br><span> </span><br><span> # start container with ggsn in background</span><br><span> docker run --cap-add=NET_ADMIN \</span><br><span>diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh</span><br><span>index 7bfacd6..337491d 100755</span><br><span>--- a/ttcn3-hlr-test/jenkins.sh</span><br><span>+++ b/ttcn3-hlr-test/jenkins.sh</span><br><span>@@ -6,7 +6,7 @@</span><br><span> "osmo-hlr-$IMAGE_SUFFIX" \</span><br><span> "ttcn3-hlr-test"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.10.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 10</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/hlr-tester</span><br><span> cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/</span><br><span>diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh</span><br><span>index d0ce189..15fab49 100755</span><br><span>--- a/ttcn3-mgw-test/jenkins.sh</span><br><span>+++ b/ttcn3-mgw-test/jenkins.sh</span><br><span>@@ -12,7 +12,7 @@</span><br><span> mkdir $VOL_BASE_DIR/mgw</span><br><span> cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.4.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 4</span><br><span> </span><br><span> # start container with mgw in background</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh</span><br><span>index fdba9a5..9f5e0bf 100755</span><br><span>--- a/ttcn3-msc-test/jenkins.sh</span><br><span>+++ b/ttcn3-msc-test/jenkins.sh</span><br><span>@@ -7,7 +7,7 @@</span><br><span> "osmo-msc-$IMAGE_SUFFIX" \</span><br><span> "ttcn3-msc-test"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.1.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 1</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/msc-tester</span><br><span> mkdir $VOL_BASE_DIR/msc-tester/unix</span><br><span>diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>index eaef78d..166a04d 100755</span><br><span>--- a/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>+++ b/ttcn3-nitb-sysinfo/jenkins.sh</span><br><span>@@ -2,7 +2,7 @@</span><br><span> </span><br><span> . ../jenkins-common.sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.5.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 5</span><br><span> </span><br><span> # start container with nitb in background</span><br><span> docker volume rm nitb-vol</span><br><span>diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>index 9c8f293..00376e7 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>@@ -6,7 +6,7 @@</span><br><span> "osmo-pcu-$IMAGE_SUFFIX" \</span><br><span> "ttcn3-pcu-test"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.14.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 14</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/pcu-tester</span><br><span> mkdir $VOL_BASE_DIR/pcu-tester/unix</span><br><span>diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh</span><br><span>index 3867e76..fa4c914 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins.sh</span><br><span>@@ -6,7 +6,7 @@</span><br><span> "osmo-pcu-$IMAGE_SUFFIX" \</span><br><span> "ttcn3-pcu-test"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.13.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 13</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/pcu-tester</span><br><span> mkdir $VOL_BASE_DIR/pcu-tester/unix</span><br><span>diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh</span><br><span>index 1da2883..c2e958c 100755</span><br><span>--- a/ttcn3-remsim-test/jenkins.sh</span><br><span>+++ b/ttcn3-remsim-test/jenkins.sh</span><br><span>@@ -56,7 +56,7 @@</span><br><span> $REPO_USER/ttcn3-remsim-test</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.17.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 17</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/remsim-tester</span><br><span> </span><br><span>diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh</span><br><span>index 25fe5ac..895f12c 100755</span><br><span>--- a/ttcn3-sccp-test/jenkins.sh</span><br><span>+++ b/ttcn3-sccp-test/jenkins.sh</span><br><span>@@ -13,7 +13,7 @@</span><br><span> mkdir $VOL_BASE_DIR/sccp</span><br><span> cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.22.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 22</span><br><span> </span><br><span> echo Starting container with sccp_demo_user</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh</span><br><span>index 08af31c..df91256 100755</span><br><span>--- a/ttcn3-sgsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-sgsn-test/jenkins.sh</span><br><span>@@ -7,7 +7,7 @@</span><br><span> "osmo-sgsn-$IMAGE_SUFFIX" \</span><br><span> "ttcn3-sgsn-test"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.8.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 8</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/sgsn-tester</span><br><span> cp SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/</span><br><span>diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh</span><br><span>index 52916cd..f1bfedd 100755</span><br><span>--- a/ttcn3-sip-test/jenkins.sh</span><br><span>+++ b/ttcn3-sip-test/jenkins.sh</span><br><span>@@ -6,7 +6,7 @@</span><br><span> "osmo-sip-$IMAGE_SUFFIX" \</span><br><span> "ttcn3-sip-test"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.11.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 11</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/sip-tester</span><br><span> mkdir $VOL_BASE_DIR/sip-tester/unix</span><br><span>diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh</span><br><span>index c45d157..6b6a2de 100755</span><br><span>--- a/ttcn3-stp-test/jenkins.sh</span><br><span>+++ b/ttcn3-stp-test/jenkins.sh</span><br><span>@@ -12,7 +12,7 @@</span><br><span> mkdir $VOL_BASE_DIR/stp</span><br><span> cp osmo-stp.cfg $VOL_BASE_DIR/stp/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 172.18.19.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 19</span><br><span> </span><br><span> echo Starting container with STP</span><br><span> docker run --rm \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/19572">change 19572</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/19572"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8802208fddcce1ffa57e5626575d23d02b320d99 </div>
<div style="display:none"> Gerrit-Change-Number: 19572 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>