<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/22821">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian-stretch-titan: prepare: start/stop links<br><br>Create symlinks to ttcn3-*-start.sh and ttcn3-*-stop.sh in the<br>prepare.sh script instead of in each of the ttcn3 Dockerfiles.<br><br>Related: OS#5017<br>Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada<br>---<br>M debian-stretch-titan/ttcn3-docker-prepare.sh<br>M ttcn3-bsc-test/Dockerfile<br>M ttcn3-bscnat-test/Dockerfile<br>M ttcn3-bts-test/Dockerfile<br>M ttcn3-fr-test/Dockerfile<br>M ttcn3-gbproxy-test/Dockerfile<br>M ttcn3-ggsn-test/Dockerfile<br>M ttcn3-hlr-test/Dockerfile<br>M ttcn3-mgw-test/Dockerfile<br>M ttcn3-msc-test/Dockerfile<br>M ttcn3-pcu-test/Dockerfile<br>M ttcn3-remsim-test/Dockerfile<br>M ttcn3-sccp-test/Dockerfile<br>M ttcn3-sgsn-test/Dockerfile<br>M ttcn3-sip-test/Dockerfile<br>M ttcn3-smlc-test/Dockerfile<br>M ttcn3-stp-test/Dockerfile<br>17 files changed, 5 insertions(+), 48 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/21/22821/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh</span><br><span>index 2b3cbd7..a5cbc91 100755</span><br><span>--- a/debian-stretch-titan/ttcn3-docker-prepare.sh</span><br><span>+++ b/debian-stretch-titan/ttcn3-docker-prepare.sh</span><br><span>@@ -32,4 +32,9 @@</span><br><span>       make deps</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Link start/stop scripts to /</span><br><span style="color: hsl(120, 100%, 40%);">+for i in ttcn3-*-start.sh ttcn3-*-stop.sh; do</span><br><span style="color: hsl(120, 100%, 40%);">+    ln -sv "/osmo-ttcn3-hacks/$i" "/$i"</span><br><span style="color: hsl(120, 100%, 40%);">+done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> make "$PROJECT"</span><br><span>diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile</span><br><span>index 80d3384..c56f3a5 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME   /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY BSC_Tests.cfg /data/BSC_Tests.cfg</span><br><span> </span><br><span> CMD    cd /data && \</span><br><span>diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile</span><br><span>index 61f699d..405c0a6 100644</span><br><span>--- a/ttcn3-bscnat-test/Dockerfile</span><br><span>+++ b/ttcn3-bscnat-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME      /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg</span><br><span> </span><br><span> CMD      cd /data && \</span><br><span>diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile</span><br><span>index 685d99b..4aa3825 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME  /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY BTS_Tests.cfg /data/BTS_Tests.cfg</span><br><span> </span><br><span> CMD    cd /data && \</span><br><span>diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile</span><br><span>index dcee72d..1f0e6e1 100644</span><br><span>--- a/ttcn3-fr-test/Dockerfile</span><br><span>+++ b/ttcn3-fr-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME      /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY FR_Tests.cfg /data/FR_Tests.cfg</span><br><span> COPY FRNET_Tests.cfg /data/FRNET_Tests.cfg</span><br><span> COPY   pipework /usr/bin/pipework</span><br><span>diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile</span><br><span>index c0a8841..661ca07 100644</span><br><span>--- a/ttcn3-gbproxy-test/Dockerfile</span><br><span>+++ b/ttcn3-gbproxy-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME     /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg</span><br><span> COPY       pipework /usr/bin/pipework</span><br><span> COPY      docker-entrypoint.sh /docker-entrypoint.sh</span><br><span>diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile</span><br><span>index 1ea2923..6c675b7 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg</span><br><span> </span><br><span> CMD  cd /data && \</span><br><span>diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile</span><br><span>index 3d12234..b180567 100644</span><br><span>--- a/ttcn3-hlr-test/Dockerfile</span><br><span>+++ b/ttcn3-hlr-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME  /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY HLR_Tests.cfg /data/HLR_Tests.cfg</span><br><span> </span><br><span> CMD    cd /data && \</span><br><span>diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile</span><br><span>index 860a06a..b05fa21 100644</span><br><span>--- a/ttcn3-mgw-test/Dockerfile</span><br><span>+++ b/ttcn3-mgw-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME  /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY MGCP_Test.cfg /data/MGCP_Test.cfg</span><br><span> </span><br><span> CMD    cd /data && \</span><br><span>diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile</span><br><span>index 93b3e0a..06c07ca 100644</span><br><span>--- a/ttcn3-msc-test/Dockerfile</span><br><span>+++ b/ttcn3-msc-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME  /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY MSC_Tests.cfg /data/MSC_Tests.cfg</span><br><span> </span><br><span> CMD    cd /data && \</span><br><span>diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile</span><br><span>index 6b2072c..2c7d52f 100644</span><br><span>--- a/ttcn3-pcu-test/Dockerfile</span><br><span>+++ b/ttcn3-pcu-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME  /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY PCU_Tests.cfg /data/PCU_Tests.cfg</span><br><span> </span><br><span> CMD    cd /data && \</span><br><span>diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile</span><br><span>index b526206..c826d7c 100644</span><br><span>--- a/ttcn3-remsim-test/Dockerfile</span><br><span>+++ b/ttcn3-remsim-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME      /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg</span><br><span> </span><br><span> CMD      cd /data && \</span><br><span>diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile</span><br><span>index b047ba7..3fc4ca3 100644</span><br><span>--- a/ttcn3-sccp-test/Dockerfile</span><br><span>+++ b/ttcn3-sccp-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME      /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg</span><br><span> </span><br><span> CMD  cd /data && \</span><br><span>diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index 01bbce1..2cc9778 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME      /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg</span><br><span> </span><br><span> CMD  cd /data && \</span><br><span>diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile</span><br><span>index 3e7b8f0..4d138ce 100644</span><br><span>--- a/ttcn3-sip-test/Dockerfile</span><br><span>+++ b/ttcn3-sip-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME  /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY SIP_Tests.cfg /data/SIP_Tests.cfg</span><br><span> </span><br><span> CMD    cd /data && \</span><br><span>diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile</span><br><span>index 0205547..d2a081f 100644</span><br><span>--- a/ttcn3-smlc-test/Dockerfile</span><br><span>+++ b/ttcn3-smlc-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME      /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY SMLC_Tests.cfg /data/SMLC_Tests.cfg</span><br><span> </span><br><span> CMD  cd /data && \</span><br><span>diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile</span><br><span>index 183c545..0ae2c5e 100644</span><br><span>--- a/ttcn3-stp-test/Dockerfile</span><br><span>+++ b/ttcn3-stp-test/Dockerfile</span><br><span>@@ -7,9 +7,6 @@</span><br><span> </span><br><span> VOLUME  /data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN    ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(0, 100%, 40%);">-   ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> COPY STP_Tests.cfg /data/STP_Tests.cfg</span><br><span> </span><br><span> CMD    cd /data && \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/22821">change 22821</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/+/22821"/><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: I634cf71cff7936efe6e0461d21dc1119de922ada </div>
<div style="display:none"> Gerrit-Change-Number: 22821 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>