Change in docker-playground[master]: Simplify git checkout, allow branches and commits

osmith gerrit-no-reply at lists.osmocom.org
Tue May 7 10:21:24 UTC 2019


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13895


Change subject: Simplify git checkout, allow branches and commits
......................................................................

Simplify git checkout, allow branches and commits

Replace the following statements:

a) "git checkout -f -B $BRANCH origin/$BRANCH"
b) "git checkout -f -B $BRANCH $BRANCH"

with:

c) "git checkout -f $BRANCH"

Regarding a), we don't need to specify 'origin/' for each branch, since
we are cloning the repositories in the same Dockerfile, and therefore we
know for sure that there is only one remote and branch names won't be
ambiguous. Removing the 'origin/' allows to put commit hashes into the
branch variables (like done in the new bisect script [1]).

Version b) does not work with branch names:
$ git checkout -f -B osmith/check-imei-before-lu osmith/check-imei-before-lu
fatal: Cannot update paths and switch to branch 'osmith/check-imei-before-lu' at the same time.
Did you intend to checkout 'osmith/check-imei-before-lu' which can not be resolved as commit?

New version c) works with both commits and branches, and it is shorter.

[1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f

Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3
---
M gr-gsm-master/Dockerfile
M osmo-bsc-master/Dockerfile
M osmo-bts-master/Dockerfile
M osmo-gerrit-libosmo/Dockerfile
M osmo-ggsn-master/Dockerfile
M osmo-hlr-master/Dockerfile
M osmo-hnbgw-master/Dockerfile
M osmo-mgw-master/Dockerfile
M osmo-msc-master/Dockerfile
M osmo-nitb-master/Dockerfile
M osmo-pcu-master/Dockerfile
M osmo-sgsn-master/Dockerfile
M osmo-sip-master/Dockerfile
M osmo-stp-master/Dockerfile
M osmocom-bb-host-master/Dockerfile
M ttcn3-bsc-test/Dockerfile
M ttcn3-bscnat-test/Dockerfile
M ttcn3-bts-test/Dockerfile
M ttcn3-ggsn-test/Dockerfile
M ttcn3-hlr-test/Dockerfile
M ttcn3-mgw-test/Dockerfile
M ttcn3-msc-test/Dockerfile
M ttcn3-nitb-sysinfo/Dockerfile
M ttcn3-pcu-test/Dockerfile
M ttcn3-sgsn-test/Dockerfile
M ttcn3-sip-test/Dockerfile
26 files changed, 47 insertions(+), 47 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/13895/1

diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile
index 03cf427..b678dd6 100644
--- a/gr-gsm-master/Dockerfile
+++ b/gr-gsm-master/Dockerfile
@@ -50,7 +50,7 @@
 ADD	http://git.osmocom.org/libosmocore/patch?h=$LIBOSMOCORE_BRANCH /tmp/commit-libosmocore
 
 RUN	cd libosmocore \
-	&& git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \
+	&& git fetch && git checkout -f $LIBOSMOCORE_BRANCH \
 	&& git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \
 	&& autoreconf -fi \
 	&& ./configure \
@@ -65,7 +65,7 @@
 ADD     http://git.osmocom.org/gr-gsm/patch?h=$GR_GSM_BRANCH /tmp/commit-gr-gsm
 
 RUN	cd gr-gsm \
-	&& git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \
+	&& git fetch && git checkout -f $GR_GSM_BRANCH \
 	&& git rev-parse HEAD \
 	&& mkdir build/ \
 	&& cd build/ \
diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile
index bcd0573..cbf80f9 100644
--- a/osmo-bsc-master/Dockerfile
+++ b/osmo-bsc-master/Dockerfile
@@ -32,7 +32,7 @@
 ADD	http://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc
 
 RUN	cd osmo-bsc && \
-	git fetch && git checkout -f -B $OSMO_BSC_BRANCH $OSMO_BSC_BRANCH && \
+	git fetch && git checkout -f $OSMO_BSC_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile
index f4ddf3a..d7707a3 100644
--- a/osmo-bts-master/Dockerfile
+++ b/osmo-bts-master/Dockerfile
@@ -33,7 +33,7 @@
 ADD	http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts
 
 RUN	cd osmo-bts && \
-	git fetch && git checkout -f -B $OSMO_BTS_BRANCH $OSMO_BTS_BRANCH && \
+	git fetch && git checkout -f $OSMO_BTS_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-trx && \
diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile
index 5442703..4db1923 100644
--- a/osmo-gerrit-libosmo/Dockerfile
+++ b/osmo-gerrit-libosmo/Dockerfile
@@ -45,7 +45,7 @@
 # build libasn1c first, no libosmo* dependency and infrequent changes
 ADD	http://git.osmocom.org/libasn1c/patch /tmp/commit-libasn1c
 RUN	cd libasn1c && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 && \
@@ -56,7 +56,7 @@
 # build libsmpp34 first, no libosmo* dependency and infrequent changes
 ADD	http://git.osmocom.org/libsmpp34/patch /tmp/commit-libsmpp34
 RUN	cd libsmpp34 && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j1 && \
@@ -67,7 +67,7 @@
 # build libosmocore before any of its downatream dependences
 ADD	http://git.osmocom.org/libosmocore/patch /tmp/commit-libosmocore
 RUN	cd libosmocore && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 && \
@@ -79,7 +79,7 @@
 
 ADD	http://git.osmocom.org/libosmo-abis/patch /tmp/commit-libosmo-abis
 RUN	cd libosmo-abis && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 && \
@@ -89,7 +89,7 @@
 
 ADD	http://git.osmocom.org/libosmo-netif/patch /tmp/commit-libosmo-netif
 RUN	cd libosmo-netif && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 && \
@@ -99,7 +99,7 @@
 
 ADD	http://git.osmocom.org/libosmo-sccp/patch /tmp/commit-libosmo-sccp
 RUN	cd libosmo-sccp && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 && \
@@ -109,7 +109,7 @@
 
 ADD	http://git.osmocom.org/osmo-mgw/patch /tmp/commit-osmo-mgw
 RUN	cd osmo-mgw && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 && \
@@ -119,7 +119,7 @@
 
 ADD	http://git.osmocom.org/osmo-iuh/patch /tmp/commit-osmo-iuh
 RUN	cd osmo-iuh && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 && \
@@ -129,7 +129,7 @@
 
 ADD	http://git.osmocom.org/osmo-ggsn/patch /tmp/commit-osmo-ggsn
 RUN	cd osmo-ggsn && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f master && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 && \
@@ -139,4 +139,4 @@
 
 
 # example command which builds a single osmo-* application at 'docker run' time in tmpfs
-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'
+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'
diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile
index cf84d02..8398fbb 100644
--- a/osmo-ggsn-master/Dockerfile
+++ b/osmo-ggsn-master/Dockerfile
@@ -25,7 +25,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ggsn.git
 ADD	http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit
 RUN	cd osmo-ggsn && \
-	git fetch && git checkout -f -B $OSMO_GGSN_BRANCH $OSMO_GGSN_BRANCH && \
+	git fetch && git checkout -f $OSMO_GGSN_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile
index 2da7c08..84df534 100644
--- a/osmo-hlr-master/Dockerfile
+++ b/osmo-hlr-master/Dockerfile
@@ -30,7 +30,7 @@
 ADD	http://git.osmocom.org/osmo-hlr/patch?h=$OSMO_HLR_BRANCH /tmp/commit-osmo-hlr
 
 RUN	cd osmo-hlr && \
-	git fetch && git checkout -f -B $OSMO_HLR_BRANCH $OSMO_HLR_BRANCH && \
+	git fetch && git checkout -f $OSMO_HLR_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile
index c89502b..347e8d4 100644
--- a/osmo-hnbgw-master/Dockerfile
+++ b/osmo-hnbgw-master/Dockerfile
@@ -30,7 +30,7 @@
 ADD	http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-mgw
 
 RUN	cd osmo-iuh && \
-	git fetch && git checkout -f -B $OSMO_IUH_BRANCH $OSMO_IUH_BRANCH && \
+	git fetch && git checkout -f $OSMO_IUH_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile
index 4c6d32a..92e499e 100644
--- a/osmo-mgw-master/Dockerfile
+++ b/osmo-mgw-master/Dockerfile
@@ -30,7 +30,7 @@
 
 
 RUN	cd osmo-mgw && \
-	git fetch && git checkout -f -B $OSMO_MGW_BRANCH $OSMO_MGW_BRANCH && \
+	git fetch && git checkout -f $OSMO_MGW_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile
index c8cfd62..83576ea 100644
--- a/osmo-msc-master/Dockerfile
+++ b/osmo-msc-master/Dockerfile
@@ -37,7 +37,7 @@
 ADD	http://git.osmocom.org/osmo-msc/patch?h=$OSMO_MSC_BRANCH /tmp/commit-osmo-msc
 
 RUN	cd osmo-msc && \
-	git fetch && git checkout -f -B $OSMO_MSC_BRANCH $OSMO_MSC_BRANCH && \
+	git fetch && git checkout -f $OSMO_MSC_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-smpp --enable-iu && \
diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile
index d3774da..d0fc8af 100644
--- a/osmo-nitb-master/Dockerfile
+++ b/osmo-nitb-master/Dockerfile
@@ -31,7 +31,7 @@
 ADD	http://git.osmocom.org/openbsc/patch?h=$OSMO_NITB_BRANCH /tmp/commit-openbsc
 
 RUN	cd openbsc/openbsc && \
-	git fetch && git checkout -f -B $OSMO_NITB_BRANCH $OSMO_NITB_BRANCH && \
+	git fetch && git checkout -f $OSMO_NITB_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-nat --enable-osmo-bsc --enable-smpp && \
diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile
index 7a294a4..fba8c31 100644
--- a/osmo-pcu-master/Dockerfile
+++ b/osmo-pcu-master/Dockerfile
@@ -28,7 +28,7 @@
 ADD	http://git.osmocom.org/osmo-pcu/patch?h=$OSMO_PCU_BRANCH /tmp/commit-osmo-pcu
 
 RUN	cd osmo-pcu && \
-	git fetch && git checkout -f -B $OSMO_PCU_BRANCH $OSMO_PCU_BRANCH && \
+	git fetch && git checkout -f $OSMO_PCU_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-trx && \
diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile
index c373564..4973240 100644
--- a/osmo-sgsn-master/Dockerfile
+++ b/osmo-sgsn-master/Dockerfile
@@ -32,7 +32,7 @@
 ADD	http://git.osmocom.org/osmo-sgsn/patch?h=$OSMO_SGSN_BRANCH /tmp/commit
 
 RUN	cd osmo-sgsn && \
-	git fetch && git checkout -f -B $OSMO_SGSN_BRANCH $OSMO_SGSN_BRANCH && \
+	git fetch && git checkout -f $OSMO_SGSN_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile
index 258b1fe..a8d14c7 100644
--- a/osmo-sip-master/Dockerfile
+++ b/osmo-sip-master/Dockerfile
@@ -36,7 +36,7 @@
 ADD	http://git.osmocom.org/osmo-sip-connector/patch?h=$OSMO_SIP_BRANCH /tmp/commit-osmo-sip-connector
 
 RUN	cd osmo-sip-connector && \
-	git fetch && git checkout -f -B $OSMO_SIP_BRANCH $OSMO_SIP_BRANCH && \
+	git fetch && git checkout -f $OSMO_SIP_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-smpp --enable-iu && \
diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile
index 0a62ed7..a1e931f 100644
--- a/osmo-stp-master/Dockerfile
+++ b/osmo-stp-master/Dockerfile
@@ -26,7 +26,7 @@
 RUN	git clone git://git.osmocom.org/libosmo-sccp.git
 ADD	http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit
 RUN	cd libosmo-sccp && \
-	git fetch && git checkout -f -B $OSMO_STP_BRANCH $OSMO_STP_BRANCH && \
+	git fetch && git checkout -f $OSMO_STP_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile
index 260f381..ef6ff2d 100644
--- a/osmocom-bb-host-master/Dockerfile
+++ b/osmocom-bb-host-master/Dockerfile
@@ -25,7 +25,7 @@
 
 ADD	http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit
 RUN	cd osmocom-bb && \
-	git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \
+	git fetch && git checkout -f $OSMO_BB_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD
 
 RUN	cd osmocom-bb/src/host/trxcon && \
diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile
index 546f33b..93d65ad 100644
--- a/ttcn3-bsc-test/Dockerfile
+++ b/ttcn3-bsc-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 RUN	git config --global user.email docker at dock.er && \
@@ -16,7 +16,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make bsc
 
diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile
index 047f21c..86422b3 100644
--- a/ttcn3-bscnat-test/Dockerfile
+++ b/ttcn3-bscnat-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 RUN	git config --global user.email docker at dock.er && \
@@ -16,7 +16,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make bsc-nat
 
diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile
index d8969bb..387afb0 100644
--- a/ttcn3-bts-test/Dockerfile
+++ b/ttcn3-bts-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 RUN	git config --global user.email docker at dock.er && \
@@ -16,7 +16,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make deps-update bts
 
diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile
index 6d6aff6..7bfb0a8 100644
--- a/ttcn3-ggsn-test/Dockerfile
+++ b/ttcn3-ggsn-test/Dockerfile
@@ -4,7 +4,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 ARG	OSMO_TTCN3_BRANCH="master"
@@ -12,7 +12,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make ggsn_tests
 
diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile
index 752d442..fa70311 100644
--- a/ttcn3-hlr-test/Dockerfile
+++ b/ttcn3-hlr-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 RUN	git config --global user.email docker at dock.er && \
@@ -16,7 +16,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make deps-update hlr
 
diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile
index bf13d12..d6267e8 100644
--- a/ttcn3-mgw-test/Dockerfile
+++ b/ttcn3-mgw-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 ARG	OSMO_TTCN3_BRANCH="master"
@@ -13,7 +13,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make mgw
 
diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile
index 53aa393..92eeee0 100644
--- a/ttcn3-msc-test/Dockerfile
+++ b/ttcn3-msc-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 RUN	git config --global user.email docker at dock.er && \
@@ -16,7 +16,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make msc
 
diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile
index d0ec87a..45bf225 100644
--- a/ttcn3-nitb-sysinfo/Dockerfile
+++ b/ttcn3-nitb-sysinfo/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 ARG	OSMO_TTCN3_BRANCH="master"
@@ -13,7 +13,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make sysinfo
 
diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile
index fbb64f5..fa9e724 100644
--- a/ttcn3-pcu-test/Dockerfile
+++ b/ttcn3-pcu-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 RUN	git config --global user.email docker at dock.er && \
@@ -16,7 +16,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make pcu
 
diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile
index 60ec333..4ea5daf 100644
--- a/ttcn3-sgsn-test/Dockerfile
+++ b/ttcn3-sgsn-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 RUN	git config --global user.email docker at dock.er && \
@@ -16,7 +16,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make sgsn
 
diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile
index eead347..4ba59be 100644
--- a/ttcn3-sip-test/Dockerfile
+++ b/ttcn3-sip-test/Dockerfile
@@ -5,7 +5,7 @@
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
+	git checkout -f master && \
 	make deps
 
 RUN	git config --global user.email docker at dock.er && \
@@ -16,7 +16,7 @@
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
 	git fetch && \
-	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
+	git checkout -f $OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make sip
 

-- 
To view, visit https://gerrit.osmocom.org/13895
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3
Gerrit-Change-Number: 13895
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190507/438a77a3/attachment.html>


More information about the gerrit-log mailing list