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

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue May 21 15:53:19 UTC 2019


Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/14118


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

Revert "Simplify git checkout, allow branches and commits"

Unfortuately this commit will check out *local* master (i.e. the
previous checkout) rather than the origin/master as it's supposed to
be. This means that ever since merging this patch, our ttcn3 tests
were running some "undefined" stale versions and not current master.

This reverts commit 26565bb729549152ce8fa89f59df02f37c907c27.

Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25
---
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/18/14118/1

diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile
index b678dd6..03cf427 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 $LIBOSMOCORE_BRANCH \
+	&& git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$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 $GR_GSM_BRANCH \
+	&& git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \
 	&& git rev-parse HEAD \
 	&& mkdir build/ \
 	&& cd build/ \
diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile
index cbf80f9..bcd0573 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 $OSMO_BSC_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_BSC_BRANCH $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 d7707a3..f4ddf3a 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 $OSMO_BTS_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_BTS_BRANCH $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 4db1923..5442703 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 master && \
+	git fetch && git checkout -f -B master origin/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 master && \
+	git fetch && git checkout -f -B master origin/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 master && \
+	git fetch && git checkout -f -B master origin/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 master && \
+	git fetch && git checkout -f -B master origin/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 master && \
+	git fetch && git checkout -f -B master origin/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 master && \
+	git fetch && git checkout -f -B master origin/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 master && \
+	git fetch && git checkout -f -B master origin/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 master && \
+	git fetch && git checkout -f -B master origin/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 master && \
+	git fetch && git checkout -f -B master origin/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 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 -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'
diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile
index 8398fbb..cf84d02 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 $OSMO_GGSN_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_GGSN_BRANCH $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 84df534..2da7c08 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 $OSMO_HLR_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_HLR_BRANCH $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 347e8d4..c89502b 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 $OSMO_IUH_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_IUH_BRANCH $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 92e499e..4c6d32a 100644
--- a/osmo-mgw-master/Dockerfile
+++ b/osmo-mgw-master/Dockerfile
@@ -30,7 +30,7 @@
 
 
 RUN	cd osmo-mgw && \
-	git fetch && git checkout -f $OSMO_MGW_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_MGW_BRANCH $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 83576ea..c8cfd62 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 $OSMO_MSC_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_MSC_BRANCH $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 d0fc8af..d3774da 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 $OSMO_NITB_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_NITB_BRANCH $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 fba8c31..7a294a4 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 $OSMO_PCU_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_PCU_BRANCH $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 4973240..c373564 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 $OSMO_SGSN_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_SGSN_BRANCH $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 a8d14c7..258b1fe 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 $OSMO_SIP_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_SIP_BRANCH $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 a1e931f..0a62ed7 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 $OSMO_STP_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_STP_BRANCH $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 ef6ff2d..260f381 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 $OSMO_BB_BRANCH && \
+	git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$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 93d65ad..546f33b 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 86422b3..047f21c 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 387afb0..d8969bb 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 7bfb0a8..6d6aff6 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 fa70311..752d442 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 d6267e8..bf13d12 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 92eeee0..53aa393 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 45bf225..d0ec87a 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 fa9e724..fbb64f5 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 09e4ec6..3049d3f 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$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 4ba59be..eead347 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 master && \
+	git checkout -f -B master origin/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 $OSMO_TTCN3_BRANCH && \
+	git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	make sip
 

-- 
To view, visit https://gerrit.osmocom.org/14118
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: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25
Gerrit-Change-Number: 14118
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190521/92ed9dce/attachment-0001.html>


More information about the gerrit-log mailing list