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
changes/73/10773/2
Oliver Smith 4 years ago
parent 3f80bc32ee
commit 7ed7a2bdd2
  1. 3
      debian-jessie-buildslave-st/Dockerfile
  2. 3
      debian-jessie-buildslave/Dockerfile
  3. 3
      osmo-bsc-master/Dockerfile
  4. 3
      osmo-bts-master/Dockerfile
  5. 3
      osmo-gerrit-libosmo/Dockerfile
  6. 3
      osmo-ggsn-master/Dockerfile
  7. 3
      osmo-hlr-master/Dockerfile
  8. 3
      osmo-hnbgw-master/Dockerfile
  9. 3
      osmo-mgw-master/Dockerfile
  10. 3
      osmo-msc-master/Dockerfile
  11. 3
      osmo-nitb-master/Dockerfile
  12. 3
      osmo-sgsn-master/Dockerfile
  13. 3
      osmo-sip-master/Dockerfile
  14. 3
      osmo-stp-master/Dockerfile
  15. 3
      osmocom-bb-host-master/Dockerfile
  16. 3
      sctp-test/Dockerfile
  17. 3
      sigtran-tests/Dockerfile
  18. 3
      ttcn3-bsc-test/Dockerfile
  19. 3
      ttcn3-bts-test/Dockerfile
  20. 3
      ttcn3-ggsn-test/Dockerfile
  21. 3
      ttcn3-hlr-test/Dockerfile
  22. 3
      ttcn3-mgw-test/Dockerfile
  23. 3
      ttcn3-msc-test/Dockerfile
  24. 3
      ttcn3-nitb-sysinfo/Dockerfile
  25. 3
      ttcn3-sgsn-test/Dockerfile
  26. 3
      ttcn3-sip-test/Dockerfile

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-buildslave
ARG USER
FROM $USER/debian-jessie-buildslave
RUN apt-get -y install \
libffi-dev \

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -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>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -1,4 +1,5 @@
FROM laforge/debian-jessie-build
ARG USER
FROM $USER/debian-jessie-build
MAINTAINER Harald Welte <laforge@gnumonks.org>

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

Loading…
Cancel
Save