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

introduce 'REGISTRY' argument to all Dockerfiles 

This is initialized to docker.io, keeping the default behaviour
if not specified.  However, it allows us to specify a private
registry later on.

Related: OS#4839
Change-Id: I32d4ee6256033c809108c1b86cb6b6c58d880f49
changes/19/21019/2
Harald Welte 2020-11-02 14:24:39 +01:00
parent a90660bef8
commit 027826fdba
30 changed files with 60 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alpine-build/Dockerfile
View File

@ -1,4 +1,5 @@
FROM alpine:3.6
ARG REGISTRY=docker.io
FROM ${REGISTRY}/alpine:3.6
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
centos-repo-install-test/Dockerfile
View File

@ -1,5 +1,6 @@
ARG USER
FROM centos:centos8
ARG REGISTRY=docker.io
FROM ${REGISTRY}/centos:centos8
# dnf-utils: for repoquery
RUN dnf install -y \

3
centos8-build/Dockerfile
View File

@ -1,4 +1,5 @@
FROM centos:centos8
ARG REGISTRY=docker.io
FROM ${REGISTRY}/centos:centos8
# Let package metadata expire after 60 seconds instead of 48 hours
RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf

3
debian-buster-build/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:buster
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:buster
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
debian-buster-erlang/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:buster
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:buster
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
debian-jessie-build/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:jessie
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:jessie
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
debian-jessie-osmocom/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:jessie
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:jessie
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
debian-repo-install-test/Dockerfile
View File

@ -1,5 +1,6 @@
ARG USER
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
COPY Release.key /tmp/Release.key

3
debian-sid-build/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:sid
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:sid
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
debian-stretch-build/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

5
debian-stretch-jenkins/Dockerfile
View File

@ -1,8 +1,9 @@
# Image used to run contrib/jenkins.sh scripts of most Osmocom projects.
# See master-builds.yml, gerrit-verifications.yml in osmo-ci.git.
ARG DEBIAN_VERSION=stretch
FROM debian:${DEBIAN_VERSION}
ARG DEBIAN_VERSION=stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:${DEBIAN_VERSION}
# Make "$DEBIAN_VERSION" available after FROM
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact

3
debian-stretch-titan/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
gr-gsm-master/Dockerfile
View File

@ -1,4 +1,5 @@
FROM archlinux/base
ARG REGISTRY=docker.io
FROM ${REGISTRY}/archlinux/base
MAINTAINER Vadim Yanitskiy <axilirator@gmail.com>

1
make/Makefile
View File

@ -59,6 +59,7 @@ post-push:
docker-build: .release
docker build \
--build-arg USER=$(USERNAME) \
--build-arg REGISTRY=$(REGISTRY_HOST) \
--build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \
--build-arg DISTRO=$(DISTRO) \
--build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \

3
open5gs-master/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:buster
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:buster
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-bsc-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-bts-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-cn-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Daniel Willmann <dwillmann@sysmocom.de>

3
osmo-ggsn-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-hlr-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-hnbgw-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-mgw-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-msc-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-nitb-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-pcu-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-remsim-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-sgsn-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-sip-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
osmo-stp-latest/Dockerfile
View File

@ -1,4 +1,5 @@
FROM debian:stretch
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte <laforge@gnumonks.org>

3
ubuntu-zesty-build/Dockerfile
View File

@ -1,4 +1,5 @@
FROM ubuntu:zesty
ARG REGISTRY=docker.io
FROM ${REGISTRY}/ubuntu:zesty
MAINTAINER Harald Welte <laforge@gnumonks.org>