Change in docker-playground[master]: ttcn3: move initial clone to debian-stretch-titan

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Thu Feb 11 15:06:06 UTC 2021 

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22817 )

Change subject: ttcn3: move initial clone to debian-stretch-titan
......................................................................

ttcn3: move initial clone to debian-stretch-titan

Clone the osmo-ttcn3-hacks and all dependency repositories less often by
moving related commands to the shared debian-stretch-titan image.

Remove the 'git checkout -f -B master origin/master' line, because the
master branch is checked out by default.

While at it, move the shared "git config" commands too, and move them
before cloning the repositories, so they don't run again whenever the
deps change (logic to invalidate the cache if deps change will be added
in the next patch).

Related: OS#5017
Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd
---
M debian-stretch-titan/Dockerfile
M ttcn3-bsc-test/Dockerfile
M ttcn3-bscnat-test/Dockerfile
M ttcn3-bts-test/Dockerfile
M ttcn3-fr-test/Dockerfile
M ttcn3-gbproxy-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-remsim-test/Dockerfile
M ttcn3-sccp-test/Dockerfile
M ttcn3-sgsn-test/Dockerfile
M ttcn3-sip-test/Dockerfile
M ttcn3-smlc-test/Dockerfile
M ttcn3-stp-test/Dockerfile
18 files changed, 7 insertions(+), 161 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, but someone else must approve



diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile
index 74bc420..0f4f17e 100644
--- a/debian-stretch-titan/Dockerfile
+++ b/debian-stretch-titan/Dockerfile
@@ -48,3 +48,10 @@
 	dpkg -i ./libfftranscode0_0.3_${DPKG_ARCH}.deb ./libfftranscode-dev_0.3_${DPKG_ARCH}.deb && \
 	apt install --fix-broken && \
 	rm libfftranscode*.deb
+
+RUN	git config --global user.email docker at dock.er && \
+	git config --global user.name "Dock Er"
+
+# clone osmo-ttcn3-hacks and deps
+RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \
+	make -C /osmo-ttcn3-hacks deps
diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile
index 8bdf87f..c26247d 100644
--- a/ttcn3-bsc-test/Dockerfile
+++ b/ttcn3-bsc-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile
index 84928a7..dcf66d2 100644
--- a/ttcn3-bscnat-test/Dockerfile
+++ b/ttcn3-bscnat-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile
index 30704cf..48909aa 100644
--- a/ttcn3-bts-test/Dockerfile
+++ b/ttcn3-bts-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile
index 7b80504..3941895 100644
--- a/ttcn3-fr-test/Dockerfile
+++ b/ttcn3-fr-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile
index 4e0c66f..2acd103 100644
--- a/ttcn3-gbproxy-test/Dockerfile
+++ b/ttcn3-gbproxy-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile
index 7e88f28..1d53747 100644
--- a/ttcn3-ggsn-test/Dockerfile
+++ b/ttcn3-ggsn-test/Dockerfile
@@ -1,12 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile
index 78ff0ce..20e1597 100644
--- a/ttcn3-hlr-test/Dockerfile
+++ b/ttcn3-hlr-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile
index 9afef2e..6580e92 100644
--- a/ttcn3-mgw-test/Dockerfile
+++ b/ttcn3-mgw-test/Dockerfile
@@ -1,12 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile
index db73c8e..bb04c10 100644
--- a/ttcn3-msc-test/Dockerfile
+++ b/ttcn3-msc-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile
index 44424b3..27a3e23 100644
--- a/ttcn3-nitb-sysinfo/Dockerfile
+++ b/ttcn3-nitb-sysinfo/Dockerfile
@@ -1,12 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile
index 2f3deff..c3606bb 100644
--- a/ttcn3-pcu-test/Dockerfile
+++ b/ttcn3-pcu-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile
index 3a2d14e..594dcb6 100644
--- a/ttcn3-remsim-test/Dockerfile
+++ b/ttcn3-remsim-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile
index 901200a..d906106 100644
--- a/ttcn3-sccp-test/Dockerfile
+++ b/ttcn3-sccp-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile
index 9b1c540..e3babb7 100644
--- a/ttcn3-sgsn-test/Dockerfile
+++ b/ttcn3-sgsn-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile
index 0828e08..5b3044c 100644
--- a/ttcn3-sip-test/Dockerfile
+++ b/ttcn3-sip-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile
index 3ffecb9..88a4dfc 100644
--- a/ttcn3-smlc-test/Dockerfile
+++ b/ttcn3-smlc-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile
index 532da9f..55ccf01 100644
--- a/ttcn3-stp-test/Dockerfile
+++ b/ttcn3-stp-test/Dockerfile
@@ -1,15 +1,5 @@
 ARG	USER
 FROM	$USER/debian-stretch-titan
-
-RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-
-RUN	cd osmo-ttcn3-hacks && \
-	git checkout -f -B master origin/master && \
-	make deps
-
-RUN	git config --global user.email docker at dock.er && \
-	git config --global user.name "Dock Er"
-
 ARG	OSMO_TTCN3_BRANCH="master"
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22817
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd
Gerrit-Change-Number: 22817
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210211/602a4a51/attachment.htm>

More information about the gerrit-log mailing list