airship/airshipctl
Code Issues Proposed changes

Merge "Use airshipit/alpine in krm-functions"

Browse Source
This commit is contained in:
Zuul 2021-06-15 19:39:59 +00:00 committed by Gerrit Code Review
commit 29d2b7ec27
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krm-functions/cloud-init/Dockerfile
View File

@ -1,5 +1,5 @@
ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 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 FROM ${GO_IMAGE} as builder
ARG GOPROXY="" ARG GOPROXY=""

3
krm-functions/kubeval-validator/Dockerfile
View File

@ -1,6 +1,5 @@
ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 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 FROM ${GO_IMAGE} as function
ARG GOPROXY="" ARG GOPROXY=""

2
krm-functions/replacement-transformer/Dockerfile
View File

@ -1,5 +1,5 @@
ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 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 FROM ${GO_IMAGE} as builder
ARG GOPROXY="" ARG GOPROXY=""

2
krm-functions/templater/Dockerfile
View File

@ -1,5 +1,5 @@
ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 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 FROM ${GO_IMAGE} as builder
ARG GOPROXY="" ARG GOPROXY=""

5
krm-functions/toolbox/Dockerfile
View File

@ -1,11 +1,12 @@
ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15 ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.15
ARG PLUGINS_BUILD_IMAGE=alpine:3.12.0 ARG PLUGINS_BUILD_IMAGE=quay.io/airshipit/alpine:3.13.5
ARG PLUGINS_RELEASE_IMAGE=alpine:3.12.0 ARG PLUGINS_RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5
FROM ${PLUGINS_BUILD_IMAGE} as ctls FROM ${PLUGINS_BUILD_IMAGE} as ctls
ARG GOPROXY="" ARG GOPROXY=""
ARG K8S_VERSION=v1.18.6 ARG K8S_VERSION=v1.18.6
RUN apk update && apk add curl RUN apk update && apk add curl
# Inject custom root certificate authorities if needed # Inject custom root certificate authorities if needed
# Docker does not have a good conditional copy statement and requires that a source file exists # 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 # to complete the copy function without error. Therefore the README.md file will be copied to