19 files changed, 47 insertions, 102 deletions
diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile
index 39ff76f..daa0f8c 100644
--- a/debian-stretch-titan/Dockerfile
+++ b/debian-stretch-titan/Dockerfile
@@ -61,3 +61,5 @@ RUN	if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \
 		git pull && \
 		make deps; \
 	fi
+
+ADD	ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare
diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh
new file mode 100755
index 0000000..d7363f5
--- /dev/null
+++ b/debian-stretch-titan/ttcn3-docker-prepare.sh
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+if [ $# -lt 2 ]; then
+	echo
+	echo "usage: ttcn3-docker-prepare OSMO_TTCN3_BRANCH PROJECT [PROJECT ...]"
+	echo "arguments:"
+	echo "  OSMO_TTCN3_BRANCH: as passed from docker"
+	echo "  PROJECT: make target from osmo-ttcn3-hacks.git, e.g. 'msc'"
+	echo
+	exit 1
+fi
+
+set -x
+OSMO_TTCN3_BRANCH=$1
+PROJECT=$2
+
+cd /osmo-ttcn3-hacks
+
+git fetch
+git checkout "$OSMO_TTCN3_BRANCH"
+
+if git symbolic-ref -q HEAD; then
+	git reset --hard origin/"$OSMO_TTCN3_BRANCH"
+fi
+
+git rev-parse --abbrev-ref HEAD
+git rev-parse HEAD
+
+make "$PROJECT"
diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile
index c26247d..80d3384 100644
--- a/ttcn3-bsc-test/Dockerfile
+++ b/ttcn3-bsc-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make bsc
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc
 
 VOLUME	/data
 
diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile
index dcf66d2..61f699d 100644
--- a/ttcn3-bscnat-test/Dockerfile
+++ b/ttcn3-bscnat-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make bsc-nat
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc-nat
 
 VOLUME	/data
 
diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile
index 48909aa..685d99b 100644
--- a/ttcn3-bts-test/Dockerfile
+++ b/ttcn3-bts-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make deps-update bts
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts
 
 VOLUME	/data
 
diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile
index 3941895..dcee72d 100644
--- a/ttcn3-fr-test/Dockerfile
+++ b/ttcn3-fr-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make fr fr-net
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" fr fr-net
 
 VOLUME	/data
 
diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile
index 2acd103..c0a8841 100644
--- a/ttcn3-gbproxy-test/Dockerfile
+++ b/ttcn3-gbproxy-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make gbproxy
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy
 
 VOLUME	/data
 
diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile
index 1d53747..10683b6 100644
--- a/ttcn3-ggsn-test/Dockerfile
+++ b/ttcn3-ggsn-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make ggsn_tests
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_tests
 
 VOLUME	/data
 
diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile
index 20e1597..3d12234 100644
--- a/ttcn3-hlr-test/Dockerfile
+++ b/ttcn3-hlr-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make deps-update hlr
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hlr
 
 VOLUME	/data
 
diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile
index 6580e92..860a06a 100644
--- a/ttcn3-mgw-test/Dockerfile
+++ b/ttcn3-mgw-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make mgw
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" mgw
 
 VOLUME	/data
 
diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile
index bb04c10..93b3e0a 100644
--- a/ttcn3-msc-test/Dockerfile
+++ b/ttcn3-msc-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make msc
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc
 
 VOLUME	/data
 
diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile
index 27a3e23..4d0cf73 100644
--- a/ttcn3-nitb-sysinfo/Dockerfile
+++ b/ttcn3-nitb-sysinfo/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make sysinfo
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sysinfo
 
 VOLUME	/data
 
diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile
index c3606bb..6b2072c 100644
--- a/ttcn3-pcu-test/Dockerfile
+++ b/ttcn3-pcu-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make pcu
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcu
 
 VOLUME	/data
 
diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile
index 594dcb6..b526206 100644
--- a/ttcn3-remsim-test/Dockerfile
+++ b/ttcn3-remsim-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make deps-update remsim
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" remsim
 
 VOLUME	/data
 
diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile
index d906106..b047ba7 100644
--- a/ttcn3-sccp-test/Dockerfile
+++ b/ttcn3-sccp-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make sccp
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp
 
 VOLUME	/data
 
diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile
index e3babb7..01bbce1 100644
--- a/ttcn3-sgsn-test/Dockerfile
+++ b/ttcn3-sgsn-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make sgsn
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sgsn
 
 VOLUME	/data
 
diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile
index 5b3044c..3e7b8f0 100644
--- a/ttcn3-sip-test/Dockerfile
+++ b/ttcn3-sip-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make sip
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sip
 
 VOLUME	/data
 
diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile
index 88a4dfc..0205547 100644
--- a/ttcn3-smlc-test/Dockerfile
+++ b/ttcn3-smlc-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make smlc
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" smlc
 
 VOLUME	/data
 
diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile
index 55ccf01..183c545 100644
--- a/ttcn3-stp-test/Dockerfile
+++ b/ttcn3-stp-test/Dockerfile
@@ -3,12 +3,7 @@ FROM	$USER/debian-stretch-titan
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
-RUN	cd osmo-ttcn3-hacks && \
-	git fetch && \
-	git checkout $OSMO_TTCN3_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
-	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
-	make stp
+RUN	ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" stp
 
 VOLUME	/data