From 224998b8f3f1ce9e1dc79c39a2c914eb6f32228a Mon Sep 17 00:00:00 2001 From: Matthias Bertschy Date: Wed, 21 Aug 2024 13:38:58 +0200 Subject: [PATCH] update to go 1.23 and base image to debian12 Signed-off-by: Matthias Bertschy --- .github/workflows/pr-created.yaml | 2 +- .github/workflows/pr-merged.yaml | 2 +- build/Dockerfile | 4 ++-- go.mod | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-created.yaml b/.github/workflows/pr-created.yaml index 61e9edf..441533e 100644 --- a/.github/workflows/pr-created.yaml +++ b/.github/workflows/pr-created.yaml @@ -16,5 +16,5 @@ jobs: pr-created: uses: kubescape/workflows/.github/workflows/incluster-comp-pr-created.yaml@main with: - GO_VERSION: "1.22" + GO_VERSION: "1.23" secrets: inherit diff --git a/.github/workflows/pr-merged.yaml b/.github/workflows/pr-merged.yaml index b79248e..ea380fa 100644 --- a/.github/workflows/pr-merged.yaml +++ b/.github/workflows/pr-merged.yaml @@ -35,7 +35,7 @@ jobs: CGO_ENABLED: 0 GO111MODULE: "" BUILD_PLATFORM: linux/amd64,linux/arm64 - GO_VERSION: "1.22" + GO_VERSION: "1.23" REQUIRED_TESTS: '[ "vuln_scan", "vuln_scan_trigger_scan_public_registry", diff --git a/build/Dockerfile b/build/Dockerfile index bc7658d..7b762fc 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.22-bullseye AS builder +FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS builder ENV GO111MODULE=on CGO_ENABLED=0 WORKDIR /work @@ -9,7 +9,7 @@ RUN --mount=target=. \ --mount=type=cache,target=/go/pkg \ GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /out/operator . -FROM gcr.io/distroless/static-debian11:nonroot +FROM gcr.io/distroless/static-debian12:nonroot COPY --from=builder /out/operator /usr/bin/operator diff --git a/go.mod b/go.mod index 7ebfd47..dbe76c0 100644 --- a/go.mod +++ b/go.mod @@ -278,3 +278,5 @@ require ( sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) + +replace github.com/project-copacetic/copacetic => github.com/anubhav06/copacetic v0.0.0-20230821175613-0a7915a62e10