<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14118">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "Simplify git checkout, allow branches and commits"<br><br>Unfortuately this commit will check out *local* master (i.e. the<br>previous checkout) rather than the origin/master as it's supposed to<br>be. This means that ever since merging this patch, our ttcn3 tests<br>were running some "undefined" stale versions and not current master.<br><br>This reverts commit 26565bb729549152ce8fa89f59df02f37c907c27.<br><br>Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25<br>---<br>M gr-gsm-master/Dockerfile<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-gerrit-libosmo/Dockerfile<br>M osmo-ggsn-master/Dockerfile<br>M osmo-hlr-master/Dockerfile<br>M osmo-hnbgw-master/Dockerfile<br>M osmo-mgw-master/Dockerfile<br>M osmo-msc-master/Dockerfile<br>M osmo-nitb-master/Dockerfile<br>M osmo-pcu-master/Dockerfile<br>M osmo-sgsn-master/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M osmo-stp-master/Dockerfile<br>M osmocom-bb-host-master/Dockerfile<br>M ttcn3-bsc-test/Dockerfile<br>M ttcn3-bscnat-test/Dockerfile<br>M ttcn3-bts-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-nitb-sysinfo/Dockerfile<br>M ttcn3-pcu-test/Dockerfile<br>M ttcn3-sgsn-test/Dockerfile<br>M ttcn3-sip-test/Dockerfile<br>26 files changed, 47 insertions(+), 47 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/18/14118/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile</span><br><span>index b678dd6..03cf427 100644</span><br><span>--- a/gr-gsm-master/Dockerfile</span><br><span>+++ b/gr-gsm-master/Dockerfile</span><br><span>@@ -50,7 +50,7 @@</span><br><span> ADD http://git.osmocom.org/libosmocore/patch?h=$LIBOSMOCORE_BRANCH /tmp/commit-libosmocore</span><br><span> </span><br><span> RUN cd libosmocore \</span><br><span style="color: hsl(0, 100%, 40%);">- && git fetch && git checkout -f $LIBOSMOCORE_BRANCH \</span><br><span style="color: hsl(120, 100%, 40%);">+ && git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \</span><br><span> && git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \</span><br><span> && autoreconf -fi \</span><br><span> && ./configure \</span><br><span>@@ -65,7 +65,7 @@</span><br><span> ADD http://git.osmocom.org/gr-gsm/patch?h=$GR_GSM_BRANCH /tmp/commit-gr-gsm</span><br><span> </span><br><span> RUN cd gr-gsm \</span><br><span style="color: hsl(0, 100%, 40%);">- && git fetch && git checkout -f $GR_GSM_BRANCH \</span><br><span style="color: hsl(120, 100%, 40%);">+ && git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \</span><br><span> && git rev-parse HEAD \</span><br><span> && mkdir build/ \</span><br><span> && cd build/ \</span><br><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index cbf80f9..bcd0573 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -32,7 +32,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc</span><br><span> </span><br><span> RUN cd osmo-bsc && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_BSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_BSC_BRANCH $OSMO_BSC_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index d7707a3..f4ddf3a 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -33,7 +33,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts</span><br><span> </span><br><span> RUN cd osmo-bts && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_BTS_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_BTS_BRANCH $OSMO_BTS_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-trx && \</span><br><span>diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile</span><br><span>index 4db1923..5442703 100644</span><br><span>--- a/osmo-gerrit-libosmo/Dockerfile</span><br><span>+++ b/osmo-gerrit-libosmo/Dockerfile</span><br><span>@@ -45,7 +45,7 @@</span><br><span> # build libasn1c first, no libosmo* dependency and infrequent changes</span><br><span> ADD http://git.osmocom.org/libasn1c/patch /tmp/commit-libasn1c</span><br><span> RUN cd libasn1c && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 && \</span><br><span>@@ -56,7 +56,7 @@</span><br><span> # build libsmpp34 first, no libosmo* dependency and infrequent changes</span><br><span> ADD http://git.osmocom.org/libsmpp34/patch /tmp/commit-libsmpp34</span><br><span> RUN cd libsmpp34 && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j1 && \</span><br><span>@@ -67,7 +67,7 @@</span><br><span> # build libosmocore before any of its downatream dependences</span><br><span> ADD http://git.osmocom.org/libosmocore/patch /tmp/commit-libosmocore</span><br><span> RUN cd libosmocore && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 && \</span><br><span>@@ -79,7 +79,7 @@</span><br><span> </span><br><span> ADD http://git.osmocom.org/libosmo-abis/patch /tmp/commit-libosmo-abis</span><br><span> RUN cd libosmo-abis && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 && \</span><br><span>@@ -89,7 +89,7 @@</span><br><span> </span><br><span> ADD http://git.osmocom.org/libosmo-netif/patch /tmp/commit-libosmo-netif</span><br><span> RUN cd libosmo-netif && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 && \</span><br><span>@@ -99,7 +99,7 @@</span><br><span> </span><br><span> ADD http://git.osmocom.org/libosmo-sccp/patch /tmp/commit-libosmo-sccp</span><br><span> RUN cd libosmo-sccp && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 && \</span><br><span>@@ -109,7 +109,7 @@</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-mgw/patch /tmp/commit-osmo-mgw</span><br><span> RUN cd osmo-mgw && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 && \</span><br><span>@@ -119,7 +119,7 @@</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-iuh/patch /tmp/commit-osmo-iuh</span><br><span> RUN cd osmo-iuh && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 && \</span><br><span>@@ -129,7 +129,7 @@</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ggsn/patch /tmp/commit-osmo-ggsn</span><br><span> RUN cd osmo-ggsn && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 && \</span><br><span>@@ -139,4 +139,4 @@</span><br><span> </span><br><span> </span><br><span> # example command which builds a single osmo-* application at 'docker run' time in tmpfs</span><br><span style="color: hsl(0, 100%, 40%);">-CMD /bin/sh -c 'cd /tmpfs && git clone --reference /build/openbsc git://git.osmocom.org/openbsc.git && cd openbsc && git checkout -f master && cd openbsc && autoreconf -fi && ./configure --enable-nat --enable-osmo-bsc --enable-smpp --enable-vty-tests --enable-external-tests && make -j8 check'</span><br><span style="color: hsl(120, 100%, 40%);">+CMD /bin/sh -c 'cd /tmpfs && git clone --reference /build/openbsc git://git.osmocom.org/openbsc.git && cd openbsc && git checkout -f -B master origin/master && cd openbsc && autoreconf -fi && ./configure --enable-nat --enable-osmo-bsc --enable-smpp --enable-vty-tests --enable-external-tests && make -j8 check'</span><br><span>diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index 8398fbb..cf84d02 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -25,7 +25,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ggsn.git</span><br><span> ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ggsn && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_GGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_GGSN_BRANCH $OSMO_GGSN_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile</span><br><span>index 84df534..2da7c08 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -30,7 +30,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-hlr/patch?h=$OSMO_HLR_BRANCH /tmp/commit-osmo-hlr</span><br><span> </span><br><span> RUN cd osmo-hlr && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_HLR_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_HLR_BRANCH $OSMO_HLR_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile</span><br><span>index 347e8d4..c89502b 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -30,7 +30,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-mgw</span><br><span> </span><br><span> RUN cd osmo-iuh && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_IUH_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_IUH_BRANCH $OSMO_IUH_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile</span><br><span>index 92e499e..4c6d32a 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -30,7 +30,7 @@</span><br><span> </span><br><span> </span><br><span> RUN cd osmo-mgw && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_MGW_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_MGW_BRANCH $OSMO_MGW_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile</span><br><span>index 83576ea..c8cfd62 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -37,7 +37,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-msc/patch?h=$OSMO_MSC_BRANCH /tmp/commit-osmo-msc</span><br><span> </span><br><span> RUN cd osmo-msc && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_MSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_MSC_BRANCH $OSMO_MSC_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-smpp --enable-iu && \</span><br><span>diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile</span><br><span>index d0fc8af..d3774da 100644</span><br><span>--- a/osmo-nitb-master/Dockerfile</span><br><span>+++ b/osmo-nitb-master/Dockerfile</span><br><span>@@ -31,7 +31,7 @@</span><br><span> ADD http://git.osmocom.org/openbsc/patch?h=$OSMO_NITB_BRANCH /tmp/commit-openbsc</span><br><span> </span><br><span> RUN cd openbsc/openbsc && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_NITB_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_NITB_BRANCH $OSMO_NITB_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-nat --enable-osmo-bsc --enable-smpp && \</span><br><span>diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile</span><br><span>index fba8c31..7a294a4 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -28,7 +28,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-pcu/patch?h=$OSMO_PCU_BRANCH /tmp/commit-osmo-pcu</span><br><span> </span><br><span> RUN cd osmo-pcu && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_PCU_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_PCU_BRANCH $OSMO_PCU_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-trx && \</span><br><span>diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index 4973240..c373564 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -32,7 +32,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-sgsn/patch?h=$OSMO_SGSN_BRANCH /tmp/commit</span><br><span> </span><br><span> RUN cd osmo-sgsn && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_SGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_SGSN_BRANCH $OSMO_SGSN_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index a8d14c7..258b1fe 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -36,7 +36,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-sip-connector/patch?h=$OSMO_SIP_BRANCH /tmp/commit-osmo-sip-connector</span><br><span> </span><br><span> RUN cd osmo-sip-connector && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_SIP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_SIP_BRANCH $OSMO_SIP_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-smpp --enable-iu && \</span><br><span>diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile</span><br><span>index a1e931f..0a62ed7 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -26,7 +26,7 @@</span><br><span> RUN git clone git://git.osmocom.org/libosmo-sccp.git</span><br><span> ADD http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit</span><br><span> RUN cd libosmo-sccp && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_STP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_STP_BRANCH $OSMO_STP_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile</span><br><span>index ef6ff2d..260f381 100644</span><br><span>--- a/osmocom-bb-host-master/Dockerfile</span><br><span>+++ b/osmocom-bb-host-master/Dockerfile</span><br><span>@@ -25,7 +25,7 @@</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit</span><br><span> RUN cd osmocom-bb && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f $OSMO_BB_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD</span><br><span> </span><br><span> RUN cd osmocom-bb/src/host/trxcon && \</span><br><span>diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile</span><br><span>index 93d65ad..546f33b 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> RUN git config --global user.email docker@dock.er && \</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make bsc</span><br><span> </span><br><span>diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile</span><br><span>index 86422b3..047f21c 100644</span><br><span>--- a/ttcn3-bscnat-test/Dockerfile</span><br><span>+++ b/ttcn3-bscnat-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> RUN git config --global user.email docker@dock.er && \</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make bsc-nat</span><br><span> </span><br><span>diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile</span><br><span>index 387afb0..d8969bb 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> RUN git config --global user.email docker@dock.er && \</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make deps-update bts</span><br><span> </span><br><span>diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile</span><br><span>index 7bfb0a8..6d6aff6 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-test/Dockerfile</span><br><span>@@ -4,7 +4,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span>@@ -12,7 +12,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make ggsn_tests</span><br><span> </span><br><span>diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile</span><br><span>index fa70311..752d442 100644</span><br><span>--- a/ttcn3-hlr-test/Dockerfile</span><br><span>+++ b/ttcn3-hlr-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> RUN git config --global user.email docker@dock.er && \</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make deps-update hlr</span><br><span> </span><br><span>diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile</span><br><span>index d6267e8..bf13d12 100644</span><br><span>--- a/ttcn3-mgw-test/Dockerfile</span><br><span>+++ b/ttcn3-mgw-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span>@@ -13,7 +13,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make mgw</span><br><span> </span><br><span>diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile</span><br><span>index 92eeee0..53aa393 100644</span><br><span>--- a/ttcn3-msc-test/Dockerfile</span><br><span>+++ b/ttcn3-msc-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> RUN git config --global user.email docker@dock.er && \</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make msc</span><br><span> </span><br><span>diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>index 45bf225..d0ec87a 100644</span><br><span>--- a/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>+++ b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span>@@ -13,7 +13,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make sysinfo</span><br><span> </span><br><span>diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile</span><br><span>index fa9e724..fbb64f5 100644</span><br><span>--- a/ttcn3-pcu-test/Dockerfile</span><br><span>+++ b/ttcn3-pcu-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> RUN git config --global user.email docker@dock.er && \</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make pcu</span><br><span> </span><br><span>diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index 09e4ec6..3049d3f 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> RUN git config --global user.email docker@dock.er && \</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make sgsn</span><br><span> </span><br><span>diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile</span><br><span>index 4ba59be..eead347 100644</span><br><span>--- a/ttcn3-sip-test/Dockerfile</span><br><span>+++ b/ttcn3-sip-test/Dockerfile</span><br><span>@@ -5,7 +5,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span> make deps</span><br><span> </span><br><span> RUN git config --global user.email docker@dock.er && \</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make sip</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14118">change 14118</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/14118"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25 </div>
<div style="display:none"> Gerrit-Change-Number: 14118 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>