<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9267">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-*-master: add Dockerfile ARG for git repo branch to be built<br><br>This allows the user to build any non-master branches of the related<br>repositories, which is helpful for local testing before pushing changes<br>to git.<br><br>Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00<br>---<br>M osmo-bsc-master/Dockerfile<br>M osmo-ggsn-master/Dockerfile<br>M osmo-hlr-master/Dockerfile<br>M osmo-hnbgw-master/Dockerfile<br>M osmo-msc-master/Dockerfile<br>M osmo-sgsn-master/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M osmo-stp-master/Dockerfile<br>M osmo-virtphy-master/Dockerfile<br>9 files changed, 36 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/9267/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 2228c39..470abcb 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -26,11 +26,13 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_BSC_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/osmo-bsc.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/osmo-bsc/patch /tmp/commit-osmo-bsc</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc</span><br><span> </span><br><span> RUN cd osmo-bsc && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_BSC_BRANCH origin/$OSMO_BSC_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-trx && \</span><br><span> make -j8 install</span><br><span>diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index eecaced..dd9f07a 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -19,11 +19,12 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_GGSN_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/osmo-ggsn.git</span><br><span style="color: hsl(0, 100%, 40%);">-ARG branch=master</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$branch /tmp/commit</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ggsn && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/$branch && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_GGSN_BRANCH origin/$OSMO_GGSN_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install && \</span><br><span>diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile</span><br><span>index af35094..68c3b43 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -23,11 +23,13 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_HLR_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/osmo-hlr.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/osmo-hlr/patch /tmp/commit-osmo-hlr</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-hlr/patch?h=$OSMO_HLR_BRANCH /tmp/commit-osmo-hlr</span><br><span> </span><br><span> RUN cd osmo-hlr && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_HLR_BRANCH origin/$OSMO_HLR_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install</span><br><span>diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile</span><br><span>index 7892bda..4c60917 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -23,11 +23,13 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_IUH_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/osmo-iuh.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/osmo-iuh/patch /tmp/commit-osmo-mgw</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-mgw</span><br><span> </span><br><span> RUN cd osmo-iuh && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_IUH_BRANCH origin/$OSMO_IUH_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install && \</span><br><span>diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile</span><br><span>index a1b604b..6fe9b3d 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -30,11 +30,13 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_MSC_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/osmo-msc.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/osmo-msc/patch /tmp/commit-osmo-msc</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-msc/patch?h=$OSMO_MSC_BRANCH /tmp/commit-osmo-msc</span><br><span> </span><br><span> RUN cd osmo-msc && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_MSC_BRANCH origin/$OSMO_MSC_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-smpp --enable-iu && \</span><br><span> make -j8 install</span><br><span>diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index eea7ed6..738987a 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -24,11 +24,13 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_SGSN_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/osmo-sgsn.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/osmo-sgsn/patch /tmp/commit</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-sgsn/patch?h=$OSMO_SGSN_BRANCH /tmp/commit</span><br><span> </span><br><span> RUN cd osmo-sgsn && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_SGSN_BRANCH origin/$OSMO_SGSN_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install && \</span><br><span>diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index abdccf9..fad4293 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -30,11 +30,13 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_SIP_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/osmo-sip-connector.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/osmo-sip-connector/patch /tmp/commit-osmo-sip-connector</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-sip-connector/patch?h=$OSMO_SIP_BRANCH /tmp/commit-osmo-sip-connector</span><br><span> </span><br><span> RUN cd osmo-sip-connector && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_SIP_BRANCH origin/$OSMO_SIP_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-smpp --enable-iu && \</span><br><span> make -j8 install</span><br><span>diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile</span><br><span>index 39e9b20..7c11d91 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -20,10 +20,12 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_STP_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/libosmo-sccp.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/libosmo-sccp/patch /tmp/commit</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit</span><br><span> RUN cd libosmo-sccp && \</span><br><span style="color: hsl(0, 100%, 40%);">- git pull && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_STP_BRANCH origin/$OSMO_STP_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install && \</span><br><span>diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile</span><br><span>index 9bac7ce..d433318 100644</span><br><span>--- a/osmo-virtphy-master/Dockerfile</span><br><span>+++ b/osmo-virtphy-master/Dockerfile</span><br><span>@@ -24,11 +24,13 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_BB_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/osmocom-bb.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/osmocom-bb/patch /tmp/commit</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit</span><br><span> </span><br><span> RUN cd osmocom-bb/src/host/virt_phy && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9267">change 9267</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9267"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00 </div>
<div style="display:none"> Gerrit-Change-Number: 9267 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>