From d72f8ce8d2a1325dacf55bbe8b9d32494af161be Mon Sep 17 00:00:00 2001 From: "cluster-stack-bot[bot]" <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Date: Sat, 4 Jan 2025 11:18:00 +0000 Subject: [PATCH] :seedling: Update Builder Image group | datasource | package | from | to | | ----------- | ------------------------ | ------- | ------- | | docker | docker.io/aquasec/trivy | 0.57.1 | 0.58.1 | | docker | docker.io/library/alpine | 3.20.3 | 3.21.0 | | docker | docker.io/library/golang | 1.23.3 | 1.23.4 | | github-tags | golangci/golangci-lint | v1.62.2 | v1.63.4 | | github-tags | helm/helm | v3.16.3 | v3.16.4 | --- .builder-image-version.txt | 2 +- .github/workflows/pr-lint.yml | 2 +- .github/workflows/schedule-scan-image.yml | 2 +- images/builder/Dockerfile | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index 0bfff3dc..5166d134 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.25 +1.1.26 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 639ab374..1bbd1104 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.25 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.26 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 2f769c2c..bd0be6de 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.25 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.26 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index 5524e765..4fe764ad 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.20.3 AS lychee +FROM docker.io/library/alpine:3.21.0 AS lychee # update: datasource=github-tags depName=lycheeverse/lychee versioning=semver ENV LYCHEE_VERSION="v0.15.1" # hadolint ignore=DL3018 @@ -34,7 +34,7 @@ FROM cgr.dev/chainguard/wolfi-base:latest AS wolfi # update: datasource=github-tags depName=kubernetes-sigs/cluster-api ARG CLUSTERCTL_VERSION="v1.8.1" # update: datasource=github-tags depName=helm/helm -ENV HELM_VERSION="v3.16.3" +ENV HELM_VERSION="v3.16.4" # update: datasource=github-tags depName=kubernetes-sigs/kind ARG KIND_VERSION="v0.24.0" # update: datasource=github-tags depName=kubernetes/kubernetes @@ -58,9 +58,9 @@ RUN apk add -U --no-cache \ trivy=~${TRIVY_VERSION#v} # Install Golang CI Lint -FROM docker.io/library/alpine:3.20.3 AS golangci +FROM docker.io/library/alpine:3.21.0 AS golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver -ENV GOLANGCI_VERSION="v1.62.2" +ENV GOLANGCI_VERSION="v1.63.4" WORKDIR / # hadolint ignore=DL3018,DL4006 RUN apk add --no-cache curl && \ @@ -70,12 +70,12 @@ 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.57.1 AS trivy +FROM docker.io/aquasec/trivy:0.58.1 AS trivy ############################ # CSO Build Image Base # ############################ -FROM docker.io/library/golang:1.23.3-bullseye +FROM docker.io/library/golang:1.23.4-bullseye # update: datasource=github-tags depName=adrienverge/yamllint versioning=semver ENV YAMLLINT_VERSION="v1.35.1"