From 4a71331581b3896188fa38c7886ce713f7646785 Mon Sep 17 00:00:00 2001 From: "cluster-stack-bot[bot]" <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 11:20:38 +0000 Subject: [PATCH] :seedling: Update Builder Image group | datasource | package | from | to | | ---------- | ------------------------ | ------ | ------ | | docker | docker.io/aquasec/trivy | 0.51.1 | 0.51.4 | | docker | docker.io/library/alpine | 3.19.1 | 3.20.0 | --- .builder-image-version.txt | 2 +- .github/workflows/pr-lint.yml | 2 +- .github/workflows/schedule-scan-image.yml | 2 +- images/builder/Dockerfile | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index 512a1faa6..5ed5faa5f 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.9 +1.1.10 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 449628274..de9ec1939 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.9 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.10 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 090f9032c..23672d606 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.9 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.10 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index 358817136..0bccb5c64 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.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as lychee +FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as lychee # update: datasource=github-tags depName=lycheeverse/lychee versioning=semver ENV LYCHEE_VERSION="v0.15.1" # hadolint ignore=DL3018 @@ -58,7 +58,7 @@ RUN apk add -U --no-cache \ trivy=~${TRIVY_VERSION#v} # Install Golang CI Lint -FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as golangci +FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver ENV GOLANGCI_VERSION="v1.59.0" WORKDIR / @@ -70,7 +70,7 @@ RUN apk add --no-cache curl && \ FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint # Install Trivy -FROM docker.io/aquasec/trivy:0.51.1@sha256:b5617ed4b09b3b64b9d24bb01083509cf836243ca74e51adb7557de79efdeb46 as trivy +FROM docker.io/aquasec/trivy:0.51.4@sha256:20a7c9cd02841a3d8d2a2506b93502a944adc57a3db9adf75b59266023b2af1e as trivy ############################ # CSO Build Image Base #