diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2018-09-05 13:12:13 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2018-09-06 15:17:06 +0200 |
| commit | 7ed7a2bdd2f249347ac93aef6a8cd32b2a6cfd3a (patch) | |
| tree | c775b2e038f0a4466a6e1d822425c4d93bdfb69c | |
| parent | 3f80bc32ee057cf5892b65649594a8ffd8df4a70 (diff) | |
Fix "'laforge/debian-jessie-build' not found"
Instead of hardcoding laforge's username in all FROM statements in the
Dockerfiles, make use of the USER variable (as passed through by the
"make/Makefile" with "docker build --build-arg USER=..."). Thanks to
fixeria for proposing this fix!
This requires running docker-ce, old versions of docker (such as the
one in the official repositories of the latest Fedora) don't support
variables in the FROM line. But docker-ce can be installed after
adding docker's 3rd party repositories.
Closes: OS#3457
Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f
26 files changed, 52 insertions, 26 deletions
diff --git a/debian-jessie-buildslave-st/Dockerfile b/debian-jessie-buildslave-st/Dockerfile index 0f1b435..2d2c985 100644 --- a/debian-jessie-buildslave-st/Dockerfile +++ b/debian-jessie-buildslave-st/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-buildslave +ARG USER +FROM $USER/debian-jessie-buildslave RUN apt-get -y install \ libffi-dev \ diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile index 70eab38..158e19e 100644 --- a/debian-jessie-buildslave/Dockerfile +++ b/debian-jessie-buildslave/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index c36fe66..5c76688 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 3c2dbec..69a8d4c 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile index ac89bbe..5442703 100644 --- a/osmo-gerrit-libosmo/Dockerfile +++ b/osmo-gerrit-libosmo/Dockerfile @@ -3,7 +3,8 @@ # projects, and then simply 'git pull' + build the given project # that we want to compile-test at 'docker run' time (in tmpfs) -FROM laforge/debian-jessie-buildslave +ARG USER +FROM $USER/debian-jessie-buildslave MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index dd9f07a..5acdf98 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index 68c3b43..45c3bd5 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 4c60917..c00d68b 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 9dc2813..2c9469e 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 3ecbb2a..fe40d78 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index f7648a7..94563b1 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 738987a..841e324 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 55a984c..e69cbc7 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 7c11d91..ae93c10 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 19cc772..0cede4b 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile index b39a459..fe5db70 100644 --- a/sctp-test/Dockerfile +++ b/sctp-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile index 452e169..b09fa09 100644 --- a/sigtran-tests/Dockerfile +++ b/sigtran-tests/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-jessie-build +ARG USER +FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 9bdc898..29a121a 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 3fec55b..1f5b47c 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 4e5e2da..5ca917b 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 0dee3d3..afa17fc 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 6460c0a..e2327b7 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index bbc60a2..f812ee0 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 8cd9e58..a50a434 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index d06195d..038a765 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 7d566b9..d7ea0db 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,4 +1,5 @@ -FROM laforge/debian-stretch-titan +ARG USER +FROM $USER/debian-stretch-titan RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git |