airship/airshipctl
Code Issues Proposed changes

Update Go base images

Browse Source 
Recently, Docker.io imposed container registry pull limits, and we have
exceeded them. This has impacted continuous-integration testing in this
repository.

This change updates our base Go images from those hosted on docker.io to
gcr.io in order to circumnavigate pull restrictions.

Change-Id: I2a990846b1a49010ff2a403d99413d8162322804
Signed-off-by: Drew Walters <andrew.walters@att.com>
This commit is contained in:
Drew Walters 2020-11-10 16:50:36 +00:00 committed by Kostyantyn Kalynovskyi
parent f2e305a56d
commit 7697d7561d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,4 +1,4 @@
ARG GO_IMAGE=docker.io/golang:1.13.1-stretch ARG GO_IMAGE=gcr.io/gcp-runtimes/go1-builder:1.13
ARG RELEASE_IMAGE=scratch ARG RELEASE_IMAGE=scratch
FROM ${GO_IMAGE} as builder FROM ${GO_IMAGE} as builder
@ -9,6 +9,8 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \ org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ENV PATH "/usr/local/go/bin:$PATH"
# 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
@ -16,6 +18,8 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
COPY ./certs/* /usr/local/share/ca-certificates/ COPY ./certs/* /usr/local/share/ca-certificates/
RUN update-ca-certificates RUN update-ca-certificates
RUN apt-get update -yq && apt-get upgrade -yq && apt-get install -y gcc make
SHELL [ "/bin/bash", "-cex" ] SHELL [ "/bin/bash", "-cex" ]
WORKDIR /usr/src/airshipctl WORKDIR /usr/src/airshipctl

6
krm-functions/replacement-transformer/Dockerfile.sample
View File

@ -1,10 +1,10 @@
FROM golang:1.13-stretch as builder FROM gcr.io/gcp-runtimes/go1-builder:1.13 as builder
ENV CGO_ENABLED=0 ENV CGO_ENABLED=0
WORKDIR /go/src/ WORKDIR /go/src/
COPY image/go.mod . COPY image/go.mod .
RUN go mod download RUN /usr/local/go/bin/go mod download
COPY main.go . COPY main.go .
RUN go build -v -o /usr/local/bin/config-function ./ RUN /usr/local/go/bin/go build -v -o /usr/local/bin/config-function ./
FROM alpine:latest FROM alpine:latest
COPY --from=builder /usr/local/bin/config-function /usr/local/bin/config-function COPY --from=builder /usr/local/bin/config-function /usr/local/bin/config-function

6
krm-functions/templater/Dockerfile.sample
View File

@ -1,10 +1,10 @@
FROM golang:1.13-stretch as builder FROM gcr.io/gcp-runtimes/go1-builder:1.13 as builder
ENV CGO_ENABLED=0 ENV CGO_ENABLED=0
WORKDIR /go/src/ WORKDIR /go/src/
COPY image/go.mod . COPY image/go.mod .
RUN go mod download RUN /usr/local/go/bin/go mod download
COPY main.go . COPY main.go .
RUN go build -v -o /usr/local/bin/config-function ./ RUN /usr/local/go/bin/go build -v -o /usr/local/bin/config-function ./
FROM alpine:latest FROM alpine:latest
COPY --from=builder /usr/local/bin/config-function /usr/local/bin/config-function COPY --from=builder /usr/local/bin/config-function /usr/local/bin/config-function