From b7e8ad6d0ec6e0045c357427283bd98433cca093 Mon Sep 17 00:00:00 2001 From: Alex Ellwein Date: Wed, 14 Jun 2023 13:36:19 +0200 Subject: [PATCH] feat: use Busybox Docker image and Go 1.20.5 for build/release Base Docker image adaptions because of CVE-2023-2650 mitigation. --- Dockerfile | 6 +- Makefile | 2 +- charts/cert-manager-webhook-netcup-1.0.16.tgz | Bin 0 -> 4496 bytes ...ert-manager-webhook-netcup-1.0.16.tgz.prov | 52 +++++++++++++++ charts/index.yaml | 59 ++++++++++++++---- charts/release.sh | 2 +- deploy/cert-manager-webhook-netcup/Chart.yaml | 10 +-- .../cert-manager-webhook-netcup/values.yaml | 2 +- 8 files changed, 108 insertions(+), 25 deletions(-) create mode 100644 charts/cert-manager-webhook-netcup-1.0.16.tgz create mode 100644 charts/cert-manager-webhook-netcup-1.0.16.tgz.prov diff --git a/Dockerfile b/Dockerfile index 1721ed9..5466327 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.20.3-alpine3.17 AS build -RUN apk add --no-cache git +FROM --platform=$BUILDPLATFORM golang:1.20.5 AS build WORKDIR /workspace COPY go.mod go.sum . RUN go mod download @@ -7,7 +6,6 @@ COPY . . ARG TARGETOS TARGETARCH RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o webhook -ldflags '-w -extldflags "-static"' . -FROM alpine:3.18 -RUN apk add --no-cache ca-certificates +FROM busybox:1.36.1-glibc COPY --from=build /workspace/webhook /usr/local/bin/webhook ENTRYPOINT ["webhook"] diff --git a/Makefile b/Makefile index 7d0417e..303cce6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ OS ?= $(shell go env GOOS) ARCH ?= $(shell go env GOARCH) IMAGE_NAME := "elvino76/cert-manager-webhook-netcup" -IMAGE_TAG := "1.0.15" +IMAGE_TAG := "1.0.16" OUT := $(shell pwd)/_out diff --git a/charts/cert-manager-webhook-netcup-1.0.16.tgz b/charts/cert-manager-webhook-netcup-1.0.16.tgz new file mode 100644 index 0000000000000000000000000000000000000000..d690b93cb0f78dd9ec981cfe5e1f2f5a08875562 GIT binary patch literal 4496 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