From 0cb8e0f5f460e04d2449c1d4c05ee98757757798 Mon Sep 17 00:00:00 2001 From: Ian Howell Date: Fri, 3 Sep 2021 12:32:36 -0500 Subject: [PATCH] AIAP: Parameterize base image This parameterizes the base image location used for the libvirt, artifact-setup, infra-builder, and runner images. Closes: #628 Change-Id: Idca33b5571017700fead0eb758af1900b4a4fcf4 --- tools/airship-in-a-pod/artifact-setup/Dockerfile | 3 ++- tools/airship-in-a-pod/infra-builder/Dockerfile | 3 ++- tools/airship-in-a-pod/libvirt/Dockerfile | 3 ++- tools/airship-in-a-pod/runner/Dockerfile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/airship-in-a-pod/artifact-setup/Dockerfile b/tools/airship-in-a-pod/artifact-setup/Dockerfile index 8fbd23654..330529f01 100644 --- a/tools/airship-in-a-pod/artifact-setup/Dockerfile +++ b/tools/airship-in-a-pod/artifact-setup/Dockerfile @@ -1,4 +1,5 @@ -FROM quay.io/airshipit/aiap-base:latest +ARG BASE_IMAGE=quay.io/airshipit/aiap-base:latest +FROM ${BASE_IMAGE} SHELL ["bash", "-exc"] ENV DEBIAN_FRONTEND noninteractive diff --git a/tools/airship-in-a-pod/infra-builder/Dockerfile b/tools/airship-in-a-pod/infra-builder/Dockerfile index 83abbdc20..543c973d1 100644 --- a/tools/airship-in-a-pod/infra-builder/Dockerfile +++ b/tools/airship-in-a-pod/infra-builder/Dockerfile @@ -1,4 +1,5 @@ -FROM quay.io/airshipit/aiap-base:latest +ARG BASE_IMAGE=quay.io/airshipit/aiap-base:latest +FROM ${BASE_IMAGE} SHELL ["bash", "-exc"] ENV DEBIAN_FRONTEND noninteractive diff --git a/tools/airship-in-a-pod/libvirt/Dockerfile b/tools/airship-in-a-pod/libvirt/Dockerfile index 033010343..59029b3e5 100644 --- a/tools/airship-in-a-pod/libvirt/Dockerfile +++ b/tools/airship-in-a-pod/libvirt/Dockerfile @@ -1,4 +1,5 @@ -FROM quay.io/airshipit/aiap-base:latest +ARG BASE_IMAGE=quay.io/airshipit/aiap-base:latest +FROM ${BASE_IMAGE} SHELL ["bash", "-exc"] ENV DEBIAN_FRONTEND noninteractive diff --git a/tools/airship-in-a-pod/runner/Dockerfile b/tools/airship-in-a-pod/runner/Dockerfile index 952f3dcf9..290d8da50 100644 --- a/tools/airship-in-a-pod/runner/Dockerfile +++ b/tools/airship-in-a-pod/runner/Dockerfile @@ -1,4 +1,5 @@ -FROM quay.io/airshipit/aiap-base:latest +ARG BASE_IMAGE=quay.io/airshipit/aiap-base:latest +FROM ${BASE_IMAGE} SHELL ["bash", "-exc"] ENV DEBIAN_FRONTEND noninteractive