From 0f3d518271668023747fa958d42f6d5813463e0c Mon Sep 17 00:00:00 2001 From: "cluster-stack-bot[bot]" <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Date: Tue, 4 Nov 2025 11:22:40 +0000 Subject: [PATCH] :seedling: Update Builder Image group | datasource | package | from | to | | ----------- | --------------------------- | ------- | ------- | | docker | docker.io/aquasec/trivy | 0.66.0 | 0.67.2 | | docker | docker.io/hadolint/hadolint | v2.13.1 | v2.14.0 | | docker | docker.io/library/alpine | 3.22.1 | 3.22.2 | | github-tags | golangci/golangci-lint | v2.4.0 | v2.6.1 | --- .builder-image-version.txt | 2 +- .github/workflows/pr-lint.yml | 2 +- .github/workflows/schedule-scan-image.yml | 2 +- images/builder/Dockerfile | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index 73a29c94..13fec672 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.34 +1.1.35 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index e62fbc02..ca4f5b37 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.34 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.35 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 386428ac..b9c7be42 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.34 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.35 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index 2839e130..b726773d 100644 --- a/images/builder/Dockerfile +++ b/images/builder/Dockerfile @@ -17,7 +17,7 @@ # If you make changes to this Dockerfile run `make builder-image-push`. # Install Lychee -FROM docker.io/library/alpine:3.22.1 AS lychee +FROM docker.io/library/alpine:3.22.2 AS lychee # update: datasource=github-tags depName=lycheeverse/lychee versioning=semver ENV LYCHEE_VERSION="v0.15.1" # hadolint ignore=DL3018 @@ -58,19 +58,19 @@ RUN apk add -U --no-cache \ trivy=~${TRIVY_VERSION#v} # Install Golang CI Lint -FROM docker.io/library/alpine:3.22.1 AS golangci +FROM docker.io/library/alpine:3.22.2 AS golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver -ENV GOLANGCI_VERSION="v2.4.0" +ENV GOLANGCI_VERSION="v2.6.1" WORKDIR / # hadolint ignore=DL3018,DL4006 RUN apk add --no-cache curl && \ curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_VERSION} # Install Hadolint -FROM docker.io/hadolint/hadolint:v2.13.1-alpine@sha256:84c2f9088a8cb0ea2bd16b5349186770d16441e77eec1a1d1e0574cf7dff47ac AS hadolint +FROM docker.io/hadolint/hadolint:v2.14.0-alpine@sha256:7aba693c1442eb31c0b015c129697cb3b6cb7da589d85c7562f9deb435a6657c AS hadolint # Install Trivy -FROM docker.io/aquasec/trivy:0.66.0 AS trivy +FROM docker.io/aquasec/trivy:0.67.2 AS trivy ############################ # CSO Build Image Base #