From f53ccb9320e0e5240c913c427b4b5d816d0f46e9 Mon Sep 17 00:00:00 2001 From: "cluster-stack-bot[bot]" <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:17:38 +0000 Subject: [PATCH] :seedling: Update Builder Image group | datasource | package | from | to | | ----------- | ------------------------ | ------- | ------- | | docker | docker.io/aquasec/trivy | 0.51.4 | 0.54.1 | | docker | docker.io/library/alpine | 3.20.0 | 3.20.2 | | github-tags | golangci/golangci-lint | v1.59.0 | v1.59.1 | | github-tags | helm/helm | v3.14.1 | v3.15.3 | --- .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 4e036596e..be5b4c7bb 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.19 +1.1.20 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 3ce2ff3b6..5948ca99b 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.19 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.20 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 d41f1fb11..a84565ace 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.19 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.20 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index 722cd179a..8b9289239 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.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as lychee +FROM docker.io/library/alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5 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.6.2" # update: datasource=github-tags depName=helm/helm -ENV HELM_VERSION="v3.14.1" +ENV HELM_VERSION="v3.15.3" # update: datasource=github-tags depName=kubernetes-sigs/kind ARG KIND_VERSION="v0.20.0" # update: datasource=github-tags depName=kubernetes/kubernetes @@ -58,19 +58,19 @@ RUN apk add -U --no-cache \ trivy=~${TRIVY_VERSION#v} # Install Golang CI Lint -FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as golangci +FROM docker.io/library/alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5 as golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver -ENV GOLANGCI_VERSION="v1.59.0" +ENV GOLANGCI_VERSION="v1.59.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.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint +FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:3c206a451cec6d486367e758645269fd7d696c5ccb6ff59d8b03b0e45268a199 as hadolint # Install Trivy -FROM docker.io/aquasec/trivy:0.51.4@sha256:20a7c9cd02841a3d8d2a2506b93502a944adc57a3db9adf75b59266023b2af1e as trivy +FROM docker.io/aquasec/trivy:0.54.1@sha256:e654e95e0753d2daeb4d5b1c2791eee6a1262c7e002770511d773c02a898c73b as trivy ############################ # CSO Build Image Base #