chore: update to go 1.21 and trivy 0.48.3 (eraser-dev#941)

Signed-off-by: Sertac Ozercan <sozercan@gmail.com> Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
ashnamehrotra · Jan 25, 2024 · f46cf8f · f46cf8f
1 parent a5422dd
commit f46cf8f
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 33 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -27,13 +27,12 @@ updates:
         - "version-update:semver-major"
         - "version-update:semver-minor"
 
-
   - package-ecosystem: docker
     directory: /
     schedule:
-      interval: daily
+      interval: weekly
 
   - package-ecosystem: docker
     directory: /build/tooling
     schedule:
-      interval: daily
+      interval: weekly
diff --git a/.github/workflows/e2e-build.yaml b/.github/workflows/e2e-build.yaml
@@ -17,10 +17,11 @@ jobs:
         uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423
         with:
           egress-policy: audit
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
       - name: Setup buildx instance
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
         with:
@@ -58,10 +59,11 @@ jobs:
         uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423
         with:
           egress-policy: audit
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
       - name: Setup buildx instance
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
         with:
@@ -98,10 +100,11 @@ jobs:
         uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423
         with:
           egress-policy: audit
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
       - name: Setup buildx instance
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
         with:
@@ -138,10 +141,11 @@ jobs:
         uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423
         with:
           egress-policy: audit
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
       - name: Setup buildx instance
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
         with:

diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
@@ -57,10 +57,11 @@ jobs:
         with:
           name: ${{ inputs.bucket-id }}
           path: ${{ github.workspace }}/images
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
       - name: Set env
         run: |
           ARCHIVE_DIR=${{ github.workspace }}/images

diff --git a/.github/workflows/release-pr.yaml b/.github/workflows/release-pr.yaml
@@ -22,10 +22,11 @@ jobs:
         with:
           egress-policy: audit
 
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
 
       - name: Set release version and target branch for vNext
         if: github.event_name == 'push'

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -49,10 +49,11 @@ jobs:
         with:
           egress-policy: audit
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
       - name: lint manager
         uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
         with:
@@ -89,10 +90,11 @@ jobs:
         uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423
         with:
           egress-policy: audit
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
       - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           key: ${{ runner.OS }}-go-${{ hashFiles('**/go.sum') }}
@@ -123,10 +125,11 @@ jobs:
           egress-policy: audit
       - name: Check out code into the Go module directory
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: "1.20"
+          go-version: "1.21"
+          check-latest: true
       - name: Check go.mod and manifests
         run: |
           go mod tidy

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -14,7 +14,7 @@ linters-settings:
   misspell:
     locale: US
   staticcheck:
-    go: "1.20"
+    go: "1.21"
 
 linters:
   disable-all: true

diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,13 @@
 # syntax=docker/dockerfile:1.6
 
-ARG BUILDERIMAGE="golang:1.20-bullseye"
-ARG TRIVY_BINARY_IMG="ghcr.io/aquasecurity/trivy:0.45.1"
-ARG STATICBASEIMAGE="gcr.io/distroless/static:latest"
-ARG STATICNONROOTBASEIMAGE="gcr.io/distroless/static:nonroot"
+# Default Trivy binary image, overwritten by Makefile
+ARG TRIVY_BINARY_IMG="ghcr.io/aquasecurity/trivy:0.48.3"
 ARG BUILDKIT_SBOM_SCAN_STAGE=builder,manager-build,collector-build,remover-build,trivy-scanner-build
 
 FROM --platform=$TARGETPLATFORM $TRIVY_BINARY_IMG AS trivy-binary
 
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM $BUILDERIMAGE AS builder
+FROM --platform=$BUILDPLATFORM golang:1.21-bookworm AS builder
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
@@ -52,25 +50,25 @@ RUN \
     --mount=type=cache,target=/go/pkg/mod \
     GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build ${LDFLAGS:+-ldflags "$LDFLAGS"} -o out/trivy-scanner ./pkg/scanners/trivy
 
-FROM --platform=$TARGETPLATFORM $STATICNONROOTBASEIMAGE AS manager
+FROM --platform=$TARGETPLATFORM gcr.io/distroless/static:nonroot AS manager
 WORKDIR /
 COPY --from=manager-build /workspace/out/manager .
 USER 65532:65532
 ENTRYPOINT ["/manager"]
 
-FROM --platform=$TARGETPLATFORM $STATICBASEIMAGE as collector
+FROM --platform=$TARGETPLATFORM gcr.io/distroless/static:latest as collector
 COPY --from=collector-build /workspace/out/collector /
 ENTRYPOINT ["/collector"]
 
-FROM --platform=$TARGETPLATFORM $STATICBASEIMAGE as remover
+FROM --platform=$TARGETPLATFORM gcr.io/distroless/static:latest as remover
 COPY --from=remover-build /workspace/out/remover /
 ENTRYPOINT ["/remover"]
 
-FROM --platform=$TARGETPLATFORM $STATICBASEIMAGE as trivy-scanner
+FROM --platform=$TARGETPLATFORM gcr.io/distroless/static:latest as trivy-scanner
 COPY --from=trivy-scanner-build /workspace/out/trivy-scanner /
 COPY --from=trivy-binary /usr/local/bin/trivy /
 WORKDIR /var/lib/trivy
 ENTRYPOINT ["/trivy-scanner"]
 
-FROM $STATICNONROOTBASEIMAGE as non-vulnerable
+FROM gcr.io/distroless/static:nonroot as non-vulnerable
 COPY --from=builder /tmp /tmp
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ REMOVER_TAG ?= ${VERSION}
 TRIVY_SCANNER_REPO ?= ghcr.io/eraser-dev/eraser-trivy-scanner
 TRIVY_SCANNER_IMG ?= ${TRIVY_SCANNER_REPO}:${TRIVY_SCANNER_TAG}
 TRIVY_BINARY_REPO ?= ghcr.io/aquasecurity/trivy
-TRIVY_BINARY_TAG ?= 0.45.1
+TRIVY_BINARY_TAG ?= 0.48.3
 TRIVY_BINARY_IMG ?= ${TRIVY_BINARY_REPO}:${TRIVY_BINARY_TAG}
 MANAGER_REPO ?= ghcr.io/eraser-dev/eraser-manager
 MANAGER_IMG ?= ${MANAGER_REPO}:${MANAGER_TAG}