From 53a227e112ac312c7110faa258e46c3a776947cb Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 18 Jan 2023 16:41:33 +1100 Subject: [PATCH 1/2] update Alpine to 3.17 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9713d9bc..52769e8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG UPSTREAM_REPO ARG UPSTREAM_TAG ARG GO_VER FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} as commons -FROM golang:${GO_VER:-1.17}-alpine3.16 as golang +FROM golang:${GO_VER:-1.17}-alpine3.17 as golang RUN apk add --no-cache git RUN go install github.com/a8m/envsubst/cmd/envsubst@v1.2.0 From 227bac65bfe07421aab6e593341c5b68920c7ed1 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 18 Jan 2023 17:34:21 +1100 Subject: [PATCH 2/2] update the docker image to alpine 3.17 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 52769e8f..fae26c67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG UPSTREAM_REPO ARG UPSTREAM_TAG ARG GO_VER FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} as commons -FROM golang:${GO_VER:-1.17}-alpine3.17 as golang +FROM golang:${GO_VER:-1.17}-alpine3.16 as golang RUN apk add --no-cache git RUN go install github.com/a8m/envsubst/cmd/envsubst@v1.2.0 @@ -35,7 +35,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ # RUN go mod download # RUN go build -o /app/build-deploy-tool -FROM docker:20.10.14 +FROM docker:20.10.22 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"