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 <andrii.ostapenko@att.com>
This commit is contained in:
parent
97bc7964dc
commit
5046975869
|
@ -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/
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 ;\
|
||||
|
|
|
@ -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; \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ;\
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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/*
|
||||
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
FROM postgres:9.5
|
||||
ARG FROM=postgres:9.5
|
||||
FROM ${FROM}
|
||||
MAINTAINER Alexander Kukushkin <alexander.kukushkin@zalando.de>
|
||||
|
||||
ARG PATRONI_VERSION
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
FROM ubuntu:18.04
|
||||
ARG FROM=ubuntu:18.04
|
||||
FROM ${FROM}
|
||||
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
FROM ubuntu:16.04
|
||||
ARG FROM=ubuntu:16.04
|
||||
FROM ${FROM}
|
||||
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
FROM centos:7
|
||||
ARG FROM=centos:7
|
||||
FROM ${FROM}
|
||||
LABEL maintainer="pete.birley@att.com"
|
||||
|
||||
ARG PROJECT=nova
|
||||
|
|
Loading…
Reference in New Issue