<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14128">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix git checkout for branches and commits<br><br>Replace 'git checkout -f -B $BRANCH origin/$BRANCH && \' in all<br>Dockerfiles that accept branch variables ($OSMO_TTCN3_BRANCH,<br>$OSMO_MGW_BRANCH, ...) with the following:<br> git checkout $BRANCH && \<br> (git symbolic-ref -q HEAD && git reset --hard origin/$BRANCH || exit 1); \<br><br>This allows using branch names and commit hashes in the $BRANCH<br>variables. Using commits is needed for the bisect script added in [1].<br><br>The second line ("(git symbolic...") checks if we are in detached HEAD<br>state after the checkout, and if we are not, pulls in all new commits<br>from origin/$BRANCH. Note that it ends in ';' instead of '&&', because<br>the command in the next line should be executed even if<br>"git symbolic-ref" does not exit with 0 (detached HEAD state).<br><br>Here is an example, to illustrate that the new command does the right<br>thing. Clone a repository and be 50 commits behind origin/master:<br>$ git clone "https://git.osmocom.org/osmo-mgw"<br>$ cd osmo-mgw<br>$ git reset --hard origin/master~50<br><br>With BRANCH="master":<br>$ git checkout master && \<br> (git symbolic-ref -q HEAD && git reset --hard origin/master || exit 1); \<br> echo "done"<br>Already on 'master'<br>...<br>done<br>$ git status<br>Your branch is up-to-date with 'origin/master'.<br><br>With BRANCH="85978d":<br>$ git checkout 85978d && \<br> (git symbolic-ref -q HEAD && git reset --hard origin/85978d || exit 1); \<br> echo "done"<br>Note: checking out '85978d'.<br>...<br>done<br>$ git status<br>HEAD detached at 85978dad<br><br>Related previous changes:<br>* [2] made it work for commit hashes, but broke using branch names other<br> than master, and pulling in new commits from master<br>* [3] made branches other than master work again, but did not fix<br> pulling in new commits from master<br>* [4] reverted [3] and the git checkout related part from [2]<br><br>[1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f<br>[2] Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869<br>[3] Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3<br>[4] Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25<br><br>Related: OS#4015<br>Change-Id: I4004980baf0b7d6096702b6f3067ccbdb369a28c<br>---<br>M gr-gsm-master/Dockerfile<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/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>25 files changed, 52 insertions(+), 26 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/28/14128/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 03cf427..bb5012b 100644</span><br><span>--- a/gr-gsm-master/Dockerfile</span><br><span>+++ b/gr-gsm-master/Dockerfile</span><br><span>@@ -50,7 +50,8 @@</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 -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \</span><br><span style="color: hsl(120, 100%, 40%);">+ && git fetch && git checkout $LIBOSMOCORE_BRANCH \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$LIBOSMOCORE_BRANCH || exit 1); \</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 +66,8 @@</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 -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \</span><br><span style="color: hsl(120, 100%, 40%);">+ && git fetch && git checkout $GR_GSM_BRANCH \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$GR_GSM_BRANCH || exit 1); \</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 bcd0573..cb80c4a 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -32,7 +32,8 @@</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 -B $OSMO_BSC_BRANCH $OSMO_BSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_BSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_BSC_BRANCH || exit 1); \</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 f4ddf3a..a7f1145 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -33,7 +33,8 @@</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 -B $OSMO_BTS_BRANCH $OSMO_BTS_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_BTS_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_BTS_BRANCH || exit 1); \</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-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index cf84d02..f27bef9 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -25,7 +25,8 @@</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 -B $OSMO_GGSN_BRANCH $OSMO_GGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_GGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GGSN_BRANCH || exit 1); \</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 2da7c08..e9f9398 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -30,7 +30,8 @@</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 -B $OSMO_HLR_BRANCH $OSMO_HLR_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_HLR_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_HLR_BRANCH || exit 1); \</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 c89502b..af5bc91 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -30,7 +30,8 @@</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 -B $OSMO_IUH_BRANCH $OSMO_IUH_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_IUH_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_IUH_BRANCH || exit 1); \</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 4c6d32a..3df37c1 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -30,7 +30,8 @@</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 -B $OSMO_MGW_BRANCH $OSMO_MGW_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_MGW_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_MGW_BRANCH || exit 1); \</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 c8cfd62..21c7eda 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -37,7 +37,8 @@</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 -B $OSMO_MSC_BRANCH $OSMO_MSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_MSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_MSC_BRANCH || exit 1); \</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 d3774da..c7fb008 100644</span><br><span>--- a/osmo-nitb-master/Dockerfile</span><br><span>+++ b/osmo-nitb-master/Dockerfile</span><br><span>@@ -31,7 +31,8 @@</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 -B $OSMO_NITB_BRANCH $OSMO_NITB_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_NITB_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_NITB_BRANCH || exit 1); \</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 7a294a4..01f7755 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -28,7 +28,8 @@</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 -B $OSMO_PCU_BRANCH $OSMO_PCU_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_PCU_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_PCU_BRANCH || exit 1); \</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 c373564..4257141 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -32,7 +32,8 @@</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 -B $OSMO_SGSN_BRANCH $OSMO_SGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_SGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_SGSN_BRANCH || exit 1); \</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 258b1fe..4a9d49b 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -36,7 +36,8 @@</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 -B $OSMO_SIP_BRANCH $OSMO_SIP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_SIP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_SIP_BRANCH || exit 1); \</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 0a62ed7..fa49085 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -26,7 +26,8 @@</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 -B $OSMO_STP_BRANCH $OSMO_STP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_STP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_STP_BRANCH || exit 1); \</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 260f381..6ec0c9a 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,8 @@</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 -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout $OSMO_BB_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_BB_BRANCH || exit 1); \</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 546f33b..9288469 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-test/Dockerfile</span><br><span>@@ -16,7 +16,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 047f21c..f927513 100644</span><br><span>--- a/ttcn3-bscnat-test/Dockerfile</span><br><span>+++ b/ttcn3-bscnat-test/Dockerfile</span><br><span>@@ -16,7 +16,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 d8969bb..29185c8 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-test/Dockerfile</span><br><span>@@ -16,7 +16,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 6d6aff6..7e88f28 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-test/Dockerfile</span><br><span>@@ -12,7 +12,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 752d442..0233035 100644</span><br><span>--- a/ttcn3-hlr-test/Dockerfile</span><br><span>+++ b/ttcn3-hlr-test/Dockerfile</span><br><span>@@ -16,7 +16,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 bf13d12..33183d0 100644</span><br><span>--- a/ttcn3-mgw-test/Dockerfile</span><br><span>+++ b/ttcn3-mgw-test/Dockerfile</span><br><span>@@ -13,7 +13,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 53aa393..ee7e5f0 100644</span><br><span>--- a/ttcn3-msc-test/Dockerfile</span><br><span>+++ b/ttcn3-msc-test/Dockerfile</span><br><span>@@ -16,7 +16,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 d0ec87a..76fd630 100644</span><br><span>--- a/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>+++ b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>@@ -13,7 +13,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 fbb64f5..b78fee2 100644</span><br><span>--- a/ttcn3-pcu-test/Dockerfile</span><br><span>+++ b/ttcn3-pcu-test/Dockerfile</span><br><span>@@ -16,7 +16,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 3049d3f..42a53f2 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -16,7 +16,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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 eead347..9f1a6df 100644</span><br><span>--- a/ttcn3-sip-test/Dockerfile</span><br><span>+++ b/ttcn3-sip-test/Dockerfile</span><br><span>@@ -16,7 +16,8 @@</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 -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</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/14128">change 14128</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/14128"/><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: I4004980baf0b7d6096702b6f3067ccbdb369a28c </div>
<div style="display:none"> Gerrit-Change-Number: 14128 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>