From 96b6a1da71d3130cdd872361e8fdea4916339421 Mon Sep 17 00:00:00 2001 From: Matthew Fuller Date: Tue, 11 May 2021 23:46:02 +0000 Subject: [PATCH] Use airshipit/alpine in krm-functions Changes the base image for krm-functions from the upstream alpine image hosted on dockerhub to our quay-hosted airshipit/alpine image to avoid dockerhub pull limits. Closes: #514 Change-Id: Id2f3e95c4d238642c1f814ec4821d7b8b148984a --- krm-functions/cloud-init/Dockerfile | 2 +- krm-functions/kubeval-validator/Dockerfile | 3 +-- krm-functions/replacement-transformer/Dockerfile | 2 +- krm-functions/templater/Dockerfile | 2 +- krm-functions/toolbox/Dockerfile | 5 +++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/krm-functions/cloud-init/Dockerfile b/krm-functions/cloud-init/Dockerfile index fbebac7f3..3037e6cf1 100644 --- a/krm-functions/cloud-init/Dockerfile +++ b/krm-functions/cloud-init/Dockerfile @@ -1,5 +1,5 @@ ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 -ARG PLUGINS_RELEASE_IMAGE=alpine:3.12.0 +ARG PLUGINS_RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5 FROM ${GO_IMAGE} as builder # Inject custom root certificate authorities if needed diff --git a/krm-functions/kubeval-validator/Dockerfile b/krm-functions/kubeval-validator/Dockerfile index 861e50876..53b3ffe10 100644 --- a/krm-functions/kubeval-validator/Dockerfile +++ b/krm-functions/kubeval-validator/Dockerfile @@ -1,6 +1,5 @@ ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 -ARG PLUGINS_RELEASE_IMAGE=alpine:3.12.0 - +ARG PLUGINS_RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5 FROM ${GO_IMAGE} as function # Inject custom root certificate authorities if needed # Docker does not have a good conditional copy statement and requires that a source file exists diff --git a/krm-functions/replacement-transformer/Dockerfile b/krm-functions/replacement-transformer/Dockerfile index fbebac7f3..3037e6cf1 100644 --- a/krm-functions/replacement-transformer/Dockerfile +++ b/krm-functions/replacement-transformer/Dockerfile @@ -1,5 +1,5 @@ ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 -ARG PLUGINS_RELEASE_IMAGE=alpine:3.12.0 +ARG PLUGINS_RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5 FROM ${GO_IMAGE} as builder # Inject custom root certificate authorities if needed diff --git a/krm-functions/templater/Dockerfile b/krm-functions/templater/Dockerfile index fbebac7f3..3037e6cf1 100644 --- a/krm-functions/templater/Dockerfile +++ b/krm-functions/templater/Dockerfile @@ -1,5 +1,5 @@ ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 -ARG PLUGINS_RELEASE_IMAGE=alpine:3.12.0 +ARG PLUGINS_RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5 FROM ${GO_IMAGE} as builder # Inject custom root certificate authorities if needed diff --git a/krm-functions/toolbox/Dockerfile b/krm-functions/toolbox/Dockerfile index bbff9dc04..f8fcfebbc 100644 --- a/krm-functions/toolbox/Dockerfile +++ b/krm-functions/toolbox/Dockerfile @@ -1,9 +1,10 @@ ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 -ARG PLUGINS_BUILD_IMAGE=alpine:3.12.0 -ARG PLUGINS_RELEASE_IMAGE=alpine:3.12.0 +ARG PLUGINS_BUILD_IMAGE=quay.io/airshipit/alpine:3.13.5 +ARG PLUGINS_RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5 FROM ${PLUGINS_BUILD_IMAGE} as ctls RUN apk update && apk add curl + # Inject custom root certificate authorities if needed # Docker does not have a good conditional copy statement and requires that a source file exists # to complete the copy function without error. Therefore the README.md file will be copied to