Change in docker-playground[master]: osmo-*-master: add Dockerfile ARG for git repo branch to be built

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/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed May 23 18:00:30 UTC 2018


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


Change subject: osmo-*-master: add Dockerfile ARG for git repo branch to be built
......................................................................

osmo-*-master: add Dockerfile ARG for git repo branch to be built

This allows the user to build any non-master branches of the related
repositories, which is helpful for local testing before pushing changes
to git.

Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00
---
M osmo-bsc-master/Dockerfile
M osmo-ggsn-master/Dockerfile
M osmo-hlr-master/Dockerfile
M osmo-hnbgw-master/Dockerfile
M osmo-msc-master/Dockerfile
M osmo-sgsn-master/Dockerfile
M osmo-sip-master/Dockerfile
M osmo-stp-master/Dockerfile
M osmo-virtphy-master/Dockerfile
9 files changed, 36 insertions(+), 19 deletions(-)



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

diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile
index 2228c39..470abcb 100644
--- a/osmo-bsc-master/Dockerfile
+++ b/osmo-bsc-master/Dockerfile
@@ -26,11 +26,13 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_BSC_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/osmo-bsc.git
-ADD	http://git.osmocom.org/osmo-bsc/patch /tmp/commit-osmo-bsc
+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 master origin/master && \
+	git fetch && git checkout -f -B $OSMO_BSC_BRANCH origin/$OSMO_BSC_BRANCH && \
 	autoreconf -fi && \
 	./configure --enable-trx && \
 	make -j8 install
diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile
index eecaced..dd9f07a 100644
--- a/osmo-ggsn-master/Dockerfile
+++ b/osmo-ggsn-master/Dockerfile
@@ -19,11 +19,12 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_GGSN_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/osmo-ggsn.git
-ARG	branch=master
-ADD	http://git.osmocom.org/osmo-ggsn/patch/?h=$branch /tmp/commit
+ADD	http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit
 RUN	cd osmo-ggsn && \
-	git fetch && git checkout -f -B master origin/$branch && \
+	git fetch && git checkout -f -B $OSMO_GGSN_BRANCH origin/$OSMO_GGSN_BRANCH && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 install && \
diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile
index af35094..68c3b43 100644
--- a/osmo-hlr-master/Dockerfile
+++ b/osmo-hlr-master/Dockerfile
@@ -23,11 +23,13 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_HLR_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/osmo-hlr.git
-ADD	http://git.osmocom.org/osmo-hlr/patch /tmp/commit-osmo-hlr
+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 master origin/master && \
+	git fetch && git checkout -f -B $OSMO_HLR_BRANCH origin/$OSMO_HLR_BRANCH && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 install
diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile
index 7892bda..4c60917 100644
--- a/osmo-hnbgw-master/Dockerfile
+++ b/osmo-hnbgw-master/Dockerfile
@@ -23,11 +23,13 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_IUH_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/osmo-iuh.git
-ADD	http://git.osmocom.org/osmo-iuh/patch /tmp/commit-osmo-mgw
+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 master origin/master && \
+	git fetch && git checkout -f -B $OSMO_IUH_BRANCH origin/$OSMO_IUH_BRANCH && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 install && \
diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile
index a1b604b..6fe9b3d 100644
--- a/osmo-msc-master/Dockerfile
+++ b/osmo-msc-master/Dockerfile
@@ -30,11 +30,13 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_MSC_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/osmo-msc.git
-ADD	http://git.osmocom.org/osmo-msc/patch /tmp/commit-osmo-msc
+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 master origin/master && \
+	git fetch && git checkout -f -B $OSMO_MSC_BRANCH origin/$OSMO_MSC_BRANCH && \
 	autoreconf -fi && \
 	./configure --enable-smpp --enable-iu && \
 	make -j8 install
diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile
index eea7ed6..738987a 100644
--- a/osmo-sgsn-master/Dockerfile
+++ b/osmo-sgsn-master/Dockerfile
@@ -24,11 +24,13 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_SGSN_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/osmo-sgsn.git
-ADD	http://git.osmocom.org/osmo-sgsn/patch /tmp/commit
+ADD	http://git.osmocom.org/osmo-sgsn/patch?h=$OSMO_SGSN_BRANCH /tmp/commit
 
 RUN	cd osmo-sgsn && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f -B $OSMO_SGSN_BRANCH origin/$OSMO_SGSN_BRANCH && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 install && \
diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile
index abdccf9..fad4293 100644
--- a/osmo-sip-master/Dockerfile
+++ b/osmo-sip-master/Dockerfile
@@ -30,11 +30,13 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_SIP_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/osmo-sip-connector.git
-ADD	http://git.osmocom.org/osmo-sip-connector/patch /tmp/commit-osmo-sip-connector
+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 master origin/master && \
+	git fetch && git checkout -f -B $OSMO_SIP_BRANCH origin/$OSMO_SIP_BRANCH && \
 	autoreconf -fi && \
 	./configure --enable-smpp --enable-iu && \
 	make -j8 install
diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile
index 39e9b20..7c11d91 100644
--- a/osmo-stp-master/Dockerfile
+++ b/osmo-stp-master/Dockerfile
@@ -20,10 +20,12 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_STP_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/libosmo-sccp.git
-ADD	http://git.osmocom.org/libosmo-sccp/patch /tmp/commit
+ADD	http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit
 RUN	cd libosmo-sccp && \
-	git pull && \
+	git fetch && git checkout -f -B $OSMO_STP_BRANCH origin/$OSMO_STP_BRANCH && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 install && \
diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile
index 9bac7ce..d433318 100644
--- a/osmo-virtphy-master/Dockerfile
+++ b/osmo-virtphy-master/Dockerfile
@@ -24,11 +24,13 @@
 
 WORKDIR	/tmp
 
+ARG	OSMO_BB_BRANCH="master"
+
 RUN	git clone git://git.osmocom.org/osmocom-bb.git
-ADD	http://git.osmocom.org/osmocom-bb/patch /tmp/commit
+ADD	http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit
 
 RUN	cd osmocom-bb/src/host/virt_phy && \
-	git fetch && git checkout -f -B master origin/master && \
+	git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \
 	autoreconf -fi && \
 	./configure && \
 	make -j8 install

-- 
To view, visit https://gerrit.osmocom.org/9267
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: I0c3349e9a60015472c96bd24fbf29aad57501a00
Gerrit-Change-Number: 9267
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/20180523/2414efb7/attachment.htm>


More information about the gerrit-log mailing list