osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Oliver Smith 2018-09-05 13:12:13 +02:00
parent 3f80bc32ee
commit 7ed7a2bdd2
26 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian-jessie-buildslave-st/Dockerfile
View File

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

3
debian-jessie-buildslave/Dockerfile
View File

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

3
osmo-bsc-master/Dockerfile
View File

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

3
osmo-bts-master/Dockerfile
View File

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

3
osmo-gerrit-libosmo/Dockerfile
View File

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

3
osmo-ggsn-master/Dockerfile
View File

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

3
osmo-hlr-master/Dockerfile
View File

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

3
osmo-hnbgw-master/Dockerfile
View File

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

3
osmo-mgw-master/Dockerfile
View File

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

3
osmo-msc-master/Dockerfile
View File

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

3
osmo-nitb-master/Dockerfile
View File

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

3
osmo-sgsn-master/Dockerfile
View File

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

3
osmo-sip-master/Dockerfile
View File

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

3
osmo-stp-master/Dockerfile
View File

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

3
osmocom-bb-host-master/Dockerfile
View File

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

3
sctp-test/Dockerfile
View File

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

3
sigtran-tests/Dockerfile
View File

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

3
ttcn3-bsc-test/Dockerfile
View File

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

3
ttcn3-bts-test/Dockerfile
View File

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

3
ttcn3-ggsn-test/Dockerfile
View File

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

3
ttcn3-hlr-test/Dockerfile
View File

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

3
ttcn3-mgw-test/Dockerfile
View File

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

3
ttcn3-msc-test/Dockerfile
View File

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

3
ttcn3-nitb-sysinfo/Dockerfile
View File

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

3
ttcn3-sgsn-test/Dockerfile
View File

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

3
ttcn3-sip-test/Dockerfile
View File

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