From 5046975869a328dc12104aa4b3ab6a93a9ddef5e Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Thu, 29 Aug 2019 13:02:02 -0500 Subject: [PATCH] Images: Update all images to allow base image over-rides This PS updates all dockerfiles to allow base image over-rides as required by many consumers of OSH. Change-Id: I53daac9c1ec4707628565abc912116d8997eba16 Signed-off-by: Andrii Ostapenko --- ceph-cephfs-provisioner/Dockerfile.ubuntu_xenial | 4 ++-- ceph-rbd-provisioner/Dockerfile.ubuntu_xenial | 4 ++-- elasticsearch-s3/Dockerfile.5_6_4 | 3 ++- elasticsearch-s3/Dockerfile.7_1_0 | 3 ++- fluentd/Dockerfile.debian | 3 ++- gate-utils/Dockerfile.debian | 3 ++- libvirt/Dockerfile.suse_15 | 4 +++- mariadb/Dockerfile.ubuntu_xenial | 5 +++-- mini-mirror/Dockerfile.ubuntu_xenial | 9 ++++----- minikube-aio/Dockerfile | 3 ++- node-problem-detector/Dockerfile.ubuntu_bionic | 3 ++- openvswitch/Dockerfile.debian | 3 ++- openvswitch/Dockerfile.ubuntu_bionic | 4 ++-- osh-selenium/Dockerfile.opensuse_15 | 3 ++- osh-selenium/Dockerfile.ubuntu_bionic | 3 ++- patroni/Dockerfile.ubuntu_xenial | 3 ++- tempest/Dockerfile.opensuse_15 | 3 ++- tempest/Dockerfile.ubuntu_bionic | 3 ++- tempest/Dockerfile.ubuntu_xenial | 3 ++- vbmc/Dockerfile.centos_7 | 3 ++- 20 files changed, 44 insertions(+), 28 deletions(-) diff --git a/ceph-cephfs-provisioner/Dockerfile.ubuntu_xenial b/ceph-cephfs-provisioner/Dockerfile.ubuntu_xenial index 6e34c641..bbcb8a10 100644 --- a/ceph-cephfs-provisioner/Dockerfile.ubuntu_xenial +++ b/ceph-cephfs-provisioner/Dockerfile.ubuntu_xenial @@ -1,5 +1,5 @@ -ARG baseimg=docker.io/ubuntu:xenial -FROM ${baseimg} +ARG FROM=docker.io/ubuntu:xenial +FROM ${FROM} ARG CEPH_RELEASE=mimic ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/ diff --git a/ceph-rbd-provisioner/Dockerfile.ubuntu_xenial b/ceph-rbd-provisioner/Dockerfile.ubuntu_xenial index 2edf001d..5bb1f3da 100644 --- a/ceph-rbd-provisioner/Dockerfile.ubuntu_xenial +++ b/ceph-rbd-provisioner/Dockerfile.ubuntu_xenial @@ -1,5 +1,5 @@ -ARG baseimg=docker.io/ubuntu:xenial -FROM ${baseimg} +ARG FROM=docker.io/ubuntu:xenial +FROM ${FROM} ARG CEPH_RELEASE=mimic ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/ diff --git a/elasticsearch-s3/Dockerfile.5_6_4 b/elasticsearch-s3/Dockerfile.5_6_4 index 11220629..8dce3e78 100644 --- a/elasticsearch-s3/Dockerfile.5_6_4 +++ b/elasticsearch-s3/Dockerfile.5_6_4 @@ -1,4 +1,5 @@ -FROM docker.io/elasticsearch:5.6.4 +ARG FROM=docker.io/elasticsearch:5.6.4 +FROM ${FROM} RUN wget -O jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 \ && chmod +x ./jq \ diff --git a/elasticsearch-s3/Dockerfile.7_1_0 b/elasticsearch-s3/Dockerfile.7_1_0 index 6e110e4d..618555f1 100644 --- a/elasticsearch-s3/Dockerfile.7_1_0 +++ b/elasticsearch-s3/Dockerfile.7_1_0 @@ -1,4 +1,5 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.0 +ARG FROM=docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.0 +FROM ${FROM} RUN wget -O jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64; \ chmod +x ./jq ;\ diff --git a/fluentd/Dockerfile.debian b/fluentd/Dockerfile.debian index 891cd387..2c76f230 100644 --- a/fluentd/Dockerfile.debian +++ b/fluentd/Dockerfile.debian @@ -1,4 +1,5 @@ -FROM docker.io/fluent/fluentd-kubernetes-daemonset:v1.10.1-debian-elasticsearch7-1.0 +ARG FROM=docker.io/fluent/fluentd-kubernetes-daemonset:v1.10.1-debian-elasticsearch7-1.0 +FROM ${FROM} RUN set -ex; \ apt-get update; \ diff --git a/gate-utils/Dockerfile.debian b/gate-utils/Dockerfile.debian index 25c16a92..b6db8a72 100644 --- a/gate-utils/Dockerfile.debian +++ b/gate-utils/Dockerfile.debian @@ -1,3 +1,4 @@ -FROM gcr.io/google-containers/debian-base-amd64:0.3 +ARG FROM=gcr.io/google-containers/debian-base-amd64:0.3 +FROM ${FROM} RUN /usr/local/bin/clean-install ipcalc diff --git a/libvirt/Dockerfile.suse_15 b/libvirt/Dockerfile.suse_15 index 9770fac1..0857cf45 100644 --- a/libvirt/Dockerfile.suse_15 +++ b/libvirt/Dockerfile.suse_15 @@ -1,4 +1,6 @@ -FROM opensuse/leap:15.1 +ARG FROM=opensuse/leap:15.1 +FROM ${FROM} + LABEL maintainer="containers@suse.com" ARG PROJECT=nova diff --git a/mariadb/Dockerfile.ubuntu_xenial b/mariadb/Dockerfile.ubuntu_xenial index 9a38e0c1..3a79726b 100644 --- a/mariadb/Dockerfile.ubuntu_xenial +++ b/mariadb/Dockerfile.ubuntu_xenial @@ -1,5 +1,6 @@ -FROM docker.io/mariadb@sha256:b3116f425f51353e2ba71b04647977b035c2c578d276e2d4285bd2798e8199ae -#FROM mariadb:10.4.12 +# mariadb:10.4.12 +ARG FROM=docker.io/mariadb@sha256:b3116f425f51353e2ba71b04647977b035c2c578d276e2d4285bd2798e8199ae +FROM ${FROM} RUN set -ex ;\ apt-get update ;\ diff --git a/mini-mirror/Dockerfile.ubuntu_xenial b/mini-mirror/Dockerfile.ubuntu_xenial index c31f256f..daaf03b6 100644 --- a/mini-mirror/Dockerfile.ubuntu_xenial +++ b/mini-mirror/Dockerfile.ubuntu_xenial @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG FROM_UBUNTU=ubuntu:16.04 -ARG FROM_NGINX=nginx -FROM ${FROM_UBUNTU} as aptly +ARG BUILD_FROM=ubuntu:16.04 +ARG FROM=nginx +FROM ${BUILD_FROM} as aptly ARG APTLY_CONFIG_PATH=etc/aptly.conf ARG MIRROR_SOURCE_FILE=mini-mirror-sources.yaml @@ -40,8 +40,7 @@ COPY tools/publish_snapshots.sh /opt/publish_snapshots.sh RUN /opt/publish_snapshots.sh "${RELEASE_SIGN_KEY_PASSPHRASE}" -FROM ${FROM_NGINX} - +FROM ${FROM} ARG APTLY_SNAPSHOT_DIR=/srv # NOTE(drewwalters96): This must match the location provided in the NGINX diff --git a/minikube-aio/Dockerfile b/minikube-aio/Dockerfile index a6abf799..dce8b4ee 100644 --- a/minikube-aio/Dockerfile +++ b/minikube-aio/Dockerfile @@ -10,7 +10,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/ubuntu:bionic +ARG FROM=docker.io/ubuntu:bionic +FROM ${FROM} MAINTAINER andrii.ostapenko@att.com ARG UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ diff --git a/node-problem-detector/Dockerfile.ubuntu_bionic b/node-problem-detector/Dockerfile.ubuntu_bionic index 53ce9e5d..75ceffe4 100644 --- a/node-problem-detector/Dockerfile.ubuntu_bionic +++ b/node-problem-detector/Dockerfile.ubuntu_bionic @@ -1,4 +1,5 @@ -FROM docker.io/ubuntu:bionic +ARG FROM=docker.io/ubuntu:bionic +FROM ${FROM} ARG NPD_VERSION="v0.8.2" ARG NPD_SRC_URL="https://github.com/kubernetes/node-problem-detector/releases/download/${NPD_VERSION}" diff --git a/openvswitch/Dockerfile.debian b/openvswitch/Dockerfile.debian index 61e28a51..165b266e 100644 --- a/openvswitch/Dockerfile.debian +++ b/openvswitch/Dockerfile.debian @@ -1,4 +1,5 @@ -FROM k8s.gcr.io/debian-iptables-amd64:v10 +ARG FROM=k8s.gcr.io/debian-iptables-amd64:v10 +FROM ${FROM} LABEL maintainer="pete.birley@att.com" ARG OVS_VERSION=2.8.1 diff --git a/openvswitch/Dockerfile.ubuntu_bionic b/openvswitch/Dockerfile.ubuntu_bionic index 0b8ec16b..8eac2f92 100644 --- a/openvswitch/Dockerfile.ubuntu_bionic +++ b/openvswitch/Dockerfile.ubuntu_bionic @@ -1,8 +1,8 @@ -FROM docker.io/ubuntu:bionic +ARG FROM=docker.io/ubuntu:bionic +FROM ${FROM} LABEL maintainer="cheng1.li@intel.com" RUN set -ex; \ apt-get update; \ apt-get install -y openvswitch-switch; \ rm -rf /var/lib/apt/lists/* - diff --git a/osh-selenium/Dockerfile.opensuse_15 b/osh-selenium/Dockerfile.opensuse_15 index cf14a380..1598347a 100644 --- a/osh-selenium/Dockerfile.opensuse_15 +++ b/osh-selenium/Dockerfile.opensuse_15 @@ -1,4 +1,5 @@ -FROM opensuse/leap:15.0 +ARG FROM=opensuse/leap:15.0 +FROM ${FROM} LABEL maintainer="cloud-devel@suse.com" COPY linux_signing_key.pub /tmp/ diff --git a/osh-selenium/Dockerfile.ubuntu_bionic b/osh-selenium/Dockerfile.ubuntu_bionic index 6a4ceca1..eb3bc60d 100644 --- a/osh-selenium/Dockerfile.ubuntu_bionic +++ b/osh-selenium/Dockerfile.ubuntu_bionic @@ -1,4 +1,5 @@ -FROM docker.io/ubuntu:bionic +ARG FROM=docker.io/ubuntu:bionic +FROM ${FROM} RUN apt-get -y update \ && apt-get install --no-install-recommends -y python3 python3-pip unzip wget gnupg \ diff --git a/patroni/Dockerfile.ubuntu_xenial b/patroni/Dockerfile.ubuntu_xenial index df37960b..8a0abb33 100644 --- a/patroni/Dockerfile.ubuntu_xenial +++ b/patroni/Dockerfile.ubuntu_xenial @@ -1,4 +1,5 @@ -FROM postgres:9.5 +ARG FROM=postgres:9.5 +FROM ${FROM} MAINTAINER Alexander Kukushkin ARG PATRONI_VERSION diff --git a/tempest/Dockerfile.opensuse_15 b/tempest/Dockerfile.opensuse_15 index a0a5a0cb..8d0b88d8 100644 --- a/tempest/Dockerfile.opensuse_15 +++ b/tempest/Dockerfile.opensuse_15 @@ -1,4 +1,5 @@ -FROM opensuse/leap:15.0 +ARG FROM=opensuse/leap:15.0 +FROM ${FROM} LABEL maintainer="cloud-devel@suse.com" ARG VERSION=Master diff --git a/tempest/Dockerfile.ubuntu_bionic b/tempest/Dockerfile.ubuntu_bionic index a4b57fab..0935c3e6 100644 --- a/tempest/Dockerfile.ubuntu_bionic +++ b/tempest/Dockerfile.ubuntu_bionic @@ -1,4 +1,5 @@ -FROM ubuntu:18.04 +ARG FROM=ubuntu:18.04 +FROM ${FROM} RUN set -ex ;\ export DEBIAN_FRONTEND=noninteractive ;\ diff --git a/tempest/Dockerfile.ubuntu_xenial b/tempest/Dockerfile.ubuntu_xenial index b6e13066..db9a3e0b 100644 --- a/tempest/Dockerfile.ubuntu_xenial +++ b/tempest/Dockerfile.ubuntu_xenial @@ -1,4 +1,5 @@ -FROM ubuntu:16.04 +ARG FROM=ubuntu:16.04 +FROM ${FROM} RUN set -ex ;\ export DEBIAN_FRONTEND=noninteractive ;\ diff --git a/vbmc/Dockerfile.centos_7 b/vbmc/Dockerfile.centos_7 index ddb3ad8d..f9a72930 100644 --- a/vbmc/Dockerfile.centos_7 +++ b/vbmc/Dockerfile.centos_7 @@ -1,4 +1,5 @@ -FROM centos:7 +ARG FROM=centos:7 +FROM ${FROM} LABEL maintainer="pete.birley@att.com" ARG PROJECT=nova