From fe083f73fcf850a7c3f8b48d5f20f1684cc20921 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Wed, 24 Aug 2022 11:18:53 -0700 Subject: [PATCH] Bump to golang 1.19.0 and to latest distroless base image For fips dockerfile, the fips 1.19 compiler has not been released yet, so bump to the latest available. --- Dockerfile | 4 ++-- hack/Dockerfile_fips | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b972bd5e..abba52b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # Copyright 2020-2022 the Pinniped contributors. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.18.3 as build-env +FROM golang:1.19.0 as build-env WORKDIR /work COPY . . @@ -24,7 +24,7 @@ RUN \ ln -s /usr/local/bin/pinniped-server /usr/local/bin/local-user-authenticator # Use a distroless runtime image with CA certificates, timezone data, and not much else. -FROM gcr.io/distroless/static:nonroot@sha256:2556293984c5738fc75208cce52cf0a4762c709cf38e4bf8def65a61992da0ad +FROM gcr.io/distroless/static:nonroot@sha256:66cd130e90992bebb68b8735a72f8ad154d0cd4a6f3a8b76f1e372467818d1b4 # Copy the server binary from the build-env stage. COPY --from=build-env /usr/local/bin /usr/local/bin diff --git a/hack/Dockerfile_fips b/hack/Dockerfile_fips index ce77f805..eeba02e0 100644 --- a/hack/Dockerfile_fips +++ b/hack/Dockerfile_fips @@ -12,7 +12,7 @@ # any type of fips certification. # use go-boringcrypto rather than main go -FROM us-docker.pkg.dev/google.com/api-project-999119582588/go-boringcrypto/golang:1.18.3b7 as build-env +FROM us-docker.pkg.dev/google.com/api-project-999119582588/go-boringcrypto/golang:1.18.5b7 as build-env WORKDIR /work COPY . . @@ -54,7 +54,7 @@ RUN \ ln -s /usr/local/bin/pinniped-server /usr/local/bin/local-user-authenticator # Use a distroless runtime image with CA certificates, timezone data, and not much else. -FROM gcr.io/distroless/static:nonroot@sha256:2556293984c5738fc75208cce52cf0a4762c709cf38e4bf8def65a61992da0ad +FROM gcr.io/distroless/static:nonroot@sha256:66cd130e90992bebb68b8735a72f8ad154d0cd4a6f3a8b76f1e372467818d1b4 # Copy the server binary from the build-env stage. COPY --from=build-env /usr/local/bin /usr/local/bin