<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10773">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Harald Welte: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix "'laforge/debian-jessie-build' not found"<br><br>Instead of hardcoding laforge's username in all FROM statements in the<br>Dockerfiles, make use of the USER variable (as passed through by the<br>"make/Makefile" with "docker build --build-arg USER=..."). Thanks to<br>fixeria for proposing this fix!<br><br>This requires running docker-ce, old versions of docker (such as the<br>one in the official repositories of the latest Fedora) don't support<br>variables in the FROM line. But docker-ce can be installed after<br>adding docker's 3rd party repositories.<br><br>Closes: OS#3457<br><br>Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f<br>---<br>M debian-jessie-buildslave-st/Dockerfile<br>M debian-jessie-buildslave/Dockerfile<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-gerrit-libosmo/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-nitb-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 sctp-test/Dockerfile<br>M sigtran-tests/Dockerfile<br>M ttcn3-bsc-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-sgsn-test/Dockerfile<br>M ttcn3-sip-test/Dockerfile<br>26 files changed, 52 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-jessie-buildslave-st/Dockerfile b/debian-jessie-buildslave-st/Dockerfile</span><br><span>index 0f1b435..2d2c985 100644</span><br><span>--- a/debian-jessie-buildslave-st/Dockerfile</span><br><span>+++ b/debian-jessie-buildslave-st/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-buildslave</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-buildslave</span><br><span> </span><br><span> RUN apt-get -y install \</span><br><span> libffi-dev \</span><br><span>diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile</span><br><span>index 70eab38..158e19e 100644</span><br><span>--- a/debian-jessie-buildslave/Dockerfile</span><br><span>+++ b/debian-jessie-buildslave/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index c36fe66..5c76688 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index 3c2dbec..69a8d4c 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile</span><br><span>index ac89bbe..5442703 100644</span><br><span>--- a/osmo-gerrit-libosmo/Dockerfile</span><br><span>+++ b/osmo-gerrit-libosmo/Dockerfile</span><br><span>@@ -3,7 +3,8 @@</span><br><span> # projects, and then simply 'git pull' + build the given project</span><br><span> # that we want to compile-test at 'docker run' time (in tmpfs)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-buildslave</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-buildslave</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index dd9f07a..5acdf98 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile</span><br><span>index 68c3b43..45c3bd5 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile</span><br><span>index 4c60917..c00d68b 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile</span><br><span>index 9dc2813..2c9469e 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile</span><br><span>index 3ecbb2a..fe40d78 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile</span><br><span>index f7648a7..94563b1 100644</span><br><span>--- a/osmo-nitb-master/Dockerfile</span><br><span>+++ b/osmo-nitb-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index 738987a..841e324 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index 55a984c..e69cbc7 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile</span><br><span>index 7c11d91..ae93c10 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile</span><br><span>index 19cc772..0cede4b 100644</span><br><span>--- a/osmocom-bb-host-master/Dockerfile</span><br><span>+++ b/osmocom-bb-host-master/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile</span><br><span>index b39a459..fe5db70 100644</span><br><span>--- a/sctp-test/Dockerfile</span><br><span>+++ b/sctp-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile</span><br><span>index 452e169..b09fa09 100644</span><br><span>--- a/sigtran-tests/Dockerfile</span><br><span>+++ b/sigtran-tests/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-jessie-build</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile</span><br><span>index 9bdc898..29a121a 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span>diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile</span><br><span>index 3fec55b..1f5b47c 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span>diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile</span><br><span>index 4e5e2da..5ca917b 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span>diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile</span><br><span>index 0dee3d3..afa17fc 100644</span><br><span>--- a/ttcn3-hlr-test/Dockerfile</span><br><span>+++ b/ttcn3-hlr-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span>diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile</span><br><span>index 6460c0a..e2327b7 100644</span><br><span>--- a/ttcn3-mgw-test/Dockerfile</span><br><span>+++ b/ttcn3-mgw-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span>diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile</span><br><span>index bbc60a2..f812ee0 100644</span><br><span>--- a/ttcn3-msc-test/Dockerfile</span><br><span>+++ b/ttcn3-msc-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span>diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>index 8cd9e58..a50a434 100644</span><br><span>--- a/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>+++ b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span>diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index d06195d..038a765 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span>diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile</span><br><span>index 7d566b9..d7ea0db 100644</span><br><span>--- a/ttcn3-sip-test/Dockerfile</span><br><span>+++ b/ttcn3-sip-test/Dockerfile</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-FROM laforge/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10773">change 10773</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/10773"/><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: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f </div>
<div style="display:none"> Gerrit-Change-Number: 10773 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>