diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh index 2b3cbd76..a5cbc911 100755 --- a/debian-stretch-titan/ttcn3-docker-prepare.sh +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -32,4 +32,9 @@ if ! diff -q /tmp/deps-Makefile deps/Makefile; then make deps fi +# Link start/stop scripts to / +for i in ttcn3-*-start.sh ttcn3-*-stop.sh; do + ln -sv "/osmo-ttcn3-hacks/$i" "/$i" +done + make "$PROJECT" diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 80d3384f..c56f3a58 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BSC_Tests.cfg /data/BSC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 61f699d3..405c0a6a 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc-nat VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 685d99be..4aa38256 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BTS_Tests.cfg /data/BTS_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index dcee72d0..1f0e6e14 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" fr fr-net VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / - COPY FR_Tests.cfg /data/FR_Tests.cfg COPY FRNET_Tests.cfg /data/FRNET_Tests.cfg COPY pipework /usr/bin/pipework diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index c0a88412..661ca07a 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / - COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg COPY pipework /usr/bin/pipework COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 10683b6e..e38e9d5c 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_tests VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 3d122346..b180567a 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hlr VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY HLR_Tests.cfg /data/HLR_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 860a06ae..b05fa216 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" mgw VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY MGCP_Test.cfg /data/MGCP_Test.cfg CMD cd /data && \ diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 93b3e0aa..06c07cac 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY MSC_Tests.cfg /data/MSC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 6b2072cc..2c7d52f4 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcu VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY PCU_Tests.cfg /data/PCU_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index b5262066..c826d7c6 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" remsim VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index b047ba77..3fc4ca3b 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 01bbce15..2cc9778d 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sgsn VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 3e7b8f0e..4d138ce3 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sip VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SIP_Tests.cfg /data/SIP_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 0205547d..d2a081f4 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" smlc VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SMLC_Tests.cfg /data/SMLC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 183c545b..0ae2c5e1 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -7,9 +7,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" stp VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY STP_Tests.cfg /data/STP_Tests.cfg CMD cd /data && \