<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13465">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">print branch name and git commit hash during docker container build<br><br>This is quite useful when looking at jenkins logs to know which exact<br>version was built at the time.<br><br>Change-Id: Id52c382b454e2beecf46820752aeff15b2c1a0ae<br>---<br>M gr-gsm-master/Dockerfile<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-ggsn-master/Dockerfile<br>M osmo-hlr-master/Dockerfile<br>M osmo-hnbgw-master/Dockerfile<br>M osmo-mgw-master/Dockerfile<br>M osmo-msc-master/Dockerfile<br>M osmo-pcu-master/Dockerfile<br>M osmo-sgsn-master/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M osmo-stp-master/Dockerfile<br>M osmocom-bb-host-master/Dockerfile<br>M ttcn3-bsc-test/Dockerfile<br>M ttcn3-bscnat-test/Dockerfile<br>M ttcn3-bts-test/Dockerfile<br>M ttcn3-ggsn-test/Dockerfile<br>M ttcn3-hlr-test/Dockerfile<br>M ttcn3-mgw-test/Dockerfile<br>M ttcn3-msc-test/Dockerfile<br>M ttcn3-nitb-sysinfo/Dockerfile<br>M ttcn3-pcu-test/Dockerfile<br>M ttcn3-sgsn-test/Dockerfile<br>M ttcn3-sip-test/Dockerfile<br>24 files changed, 26 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile</span><br><span>index 24c8c95..1a8a225 100644</span><br><span>--- a/gr-gsm-master/Dockerfile</span><br><span>+++ b/gr-gsm-master/Dockerfile</span><br><span>@@ -51,6 +51,7 @@</span><br><span> </span><br><span> RUN cd libosmocore \</span><br><span> && git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \</span><br><span style="color: hsl(120, 100%, 40%);">+ && git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \</span><br><span> && autoreconf -fi \</span><br><span> && ./configure \</span><br><span> --disable-doxygen \</span><br><span>@@ -65,6 +66,7 @@</span><br><span> </span><br><span> RUN cd gr-gsm \</span><br><span> && git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \</span><br><span style="color: hsl(120, 100%, 40%);">+ && git rev-parse HEAD \</span><br><span> && mkdir build/ \</span><br><span> && cd build/ \</span><br><span> && cmake \</span><br><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 5c76688..5d3d2d5 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -33,6 +33,7 @@</span><br><span> </span><br><span> RUN cd osmo-bsc && \</span><br><span> git fetch && git checkout -f -B $OSMO_BSC_BRANCH origin/$OSMO_BSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install</span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index 69a8d4c..25d6d66 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -34,6 +34,7 @@</span><br><span> </span><br><span> RUN cd osmo-bts && \</span><br><span> git fetch && git checkout -f -B $OSMO_BTS_BRANCH origin/$OSMO_BTS_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</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 5acdf98..bd8d815 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -26,6 +26,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ggsn && \</span><br><span> git fetch && git checkout -f -B $OSMO_GGSN_BRANCH origin/$OSMO_GGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</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 45c3bd5..07d175d 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -31,6 +31,7 @@</span><br><span> </span><br><span> RUN cd osmo-hlr && \</span><br><span> git fetch && git checkout -f -B $OSMO_HLR_BRANCH origin/$OSMO_HLR_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</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 c00d68b..068025b 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -31,6 +31,7 @@</span><br><span> </span><br><span> RUN cd osmo-iuh && \</span><br><span> git fetch && git checkout -f -B $OSMO_IUH_BRANCH origin/$OSMO_IUH_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install && \</span><br><span>diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile</span><br><span>index 2c9469e..dcfa7da 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -31,6 +31,7 @@</span><br><span> </span><br><span> RUN cd osmo-mgw && \</span><br><span> git fetch && git checkout -f -B $OSMO_MGW_BRANCH origin/$OSMO_MGW_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</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 fe40d78..619dda1 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -38,6 +38,7 @@</span><br><span> </span><br><span> RUN cd osmo-msc && \</span><br><span> git fetch && git checkout -f -B $OSMO_MSC_BRANCH origin/$OSMO_MSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</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-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile</span><br><span>index 867f534..9684410 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -29,6 +29,7 @@</span><br><span> </span><br><span> RUN cd osmo-pcu && \</span><br><span> git fetch && git checkout -f -B $OSMO_PCU_BRANCH origin/$OSMO_PCU_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-trx && \</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 d87f295..f941e9c 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -33,6 +33,7 @@</span><br><span> </span><br><span> RUN cd osmo-sgsn && \</span><br><span> git fetch && git checkout -f -B $OSMO_SGSN_BRANCH origin/$OSMO_SGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</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 e69cbc7..7340bb3 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -37,6 +37,7 @@</span><br><span> </span><br><span> RUN cd osmo-sip-connector && \</span><br><span> git fetch && git checkout -f -B $OSMO_SIP_BRANCH origin/$OSMO_SIP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</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 ae93c10..57afbb7 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -27,6 +27,7 @@</span><br><span> ADD http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit</span><br><span> RUN cd libosmo-sccp && \</span><br><span> git fetch && git checkout -f -B $OSMO_STP_BRANCH origin/$OSMO_STP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span> make -j8 install && \</span><br><span>diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile</span><br><span>index 0cede4b..8311f80 100644</span><br><span>--- a/osmocom-bb-host-master/Dockerfile</span><br><span>+++ b/osmocom-bb-host-master/Dockerfile</span><br><span>@@ -25,7 +25,8 @@</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit</span><br><span> RUN cd osmocom-bb && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH</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 style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD</span><br><span> </span><br><span> RUN cd osmocom-bb/src/host/trxcon && \</span><br><span> autoreconf -fi && \</span><br><span>diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile</span><br><span>index 29a121a..546f33b 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-test/Dockerfile</span><br><span>@@ -17,6 +17,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make bsc</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile</span><br><span>index b19413e..047f21c 100644</span><br><span>--- a/ttcn3-bscnat-test/Dockerfile</span><br><span>+++ b/ttcn3-bscnat-test/Dockerfile</span><br><span>@@ -17,6 +17,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make bsc-nat</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile</span><br><span>index 1f5b47c..d8969bb 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-test/Dockerfile</span><br><span>@@ -17,6 +17,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make deps-update bts</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile</span><br><span>index 5ca917b..6d6aff6 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-test/Dockerfile</span><br><span>@@ -13,6 +13,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make ggsn_tests</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile</span><br><span>index afa17fc..752d442 100644</span><br><span>--- a/ttcn3-hlr-test/Dockerfile</span><br><span>+++ b/ttcn3-hlr-test/Dockerfile</span><br><span>@@ -17,6 +17,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make deps-update hlr</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile</span><br><span>index e2327b7..bf13d12 100644</span><br><span>--- a/ttcn3-mgw-test/Dockerfile</span><br><span>+++ b/ttcn3-mgw-test/Dockerfile</span><br><span>@@ -14,6 +14,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make mgw</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile</span><br><span>index f812ee0..53aa393 100644</span><br><span>--- a/ttcn3-msc-test/Dockerfile</span><br><span>+++ b/ttcn3-msc-test/Dockerfile</span><br><span>@@ -17,6 +17,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make msc</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>index a50a434..d0ec87a 100644</span><br><span>--- a/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>+++ b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>@@ -14,6 +14,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make sysinfo</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile</span><br><span>index 45b22d0..fbb64f5 100644</span><br><span>--- a/ttcn3-pcu-test/Dockerfile</span><br><span>+++ b/ttcn3-pcu-test/Dockerfile</span><br><span>@@ -17,6 +17,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make pcu</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index 038a765..60ec333 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -17,6 +17,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make sgsn</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile</span><br><span>index d7ea0db..eead347 100644</span><br><span>--- a/ttcn3-sip-test/Dockerfile</span><br><span>+++ b/ttcn3-sip-test/Dockerfile</span><br><span>@@ -17,6 +17,7 @@</span><br><span> RUN cd osmo-ttcn3-hacks && \</span><br><span> git fetch && \</span><br><span> git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> make sip</span><br><span> </span><br><span> VOLUME /data</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13465">change 13465</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/13465"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id52c382b454e2beecf46820752aeff15b2c1a0ae </div>
<div style="display:none"> Gerrit-Change-Number: 13465 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>