From 3b91b3b6246d274d3e2f42e2541ac74a39285635 Mon Sep 17 00:00:00 2001 From: "cluster-stack-bot[bot]" <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 11:24:08 +0000 Subject: [PATCH] :seedling: Update Builder Image group | datasource | package | from | to | | ----------- | ----------------------- | ------ | ------ | | docker | docker.io/aquasec/trivy | 0.63.0 | 0.64.0 | | github-tags | golangci/golangci-lint | v2.1.6 | v2.2.1 | --- .builder-image-version.txt | 2 +- .github/workflows/pr-lint.yml | 2 +- .github/workflows/schedule-scan-image.yml | 2 +- images/builder/Dockerfile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index c1847bf9f..ba7b2f76d 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.31 +1.1.32 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 18dd0c5de..4dac1ae85 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -21,7 +21,7 @@ jobs: if: github.event_name != 'pull_request' || !github.event.pull_request.draft runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.31 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.32 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml index 5cea1ad96..882042584 100644 --- a/.github/workflows/schedule-scan-image.yml +++ b/.github/workflows/schedule-scan-image.yml @@ -9,7 +9,7 @@ jobs: name: Trivy runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.31 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.32 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index e569b368a..27525a523 100644 --- a/images/builder/Dockerfile +++ b/images/builder/Dockerfile @@ -60,7 +60,7 @@ RUN apk add -U --no-cache \ # Install Golang CI Lint FROM docker.io/library/alpine:3.22.0 AS golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver -ENV GOLANGCI_VERSION="v2.1.6" +ENV GOLANGCI_VERSION="v2.2.1" WORKDIR / # hadolint ignore=DL3018,DL4006 RUN apk add --no-cache curl && \ @@ -70,7 +70,7 @@ RUN apk add --no-cache curl && \ FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:3c206a451cec6d486367e758645269fd7d696c5ccb6ff59d8b03b0e45268a199 AS hadolint # Install Trivy -FROM docker.io/aquasec/trivy:0.63.0 AS trivy +FROM docker.io/aquasec/trivy:0.64.0 AS trivy ############################ # CSO Build Image Base #