Merge pull request #95 from SovereignCloudStack/renovate/cso-builder-…

…image 🌱 Update Builder Image group
SovereignCloudStack · Mar 3, 2024 · 3ffaad9 · 3ffaad9
2 parents fa182cb + 9929be2
commit 3ffaad9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.builder-image-version.txt b/.builder-image-version.txt
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git 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.0.1
+      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.1
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git 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.0.1
+      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.1
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile
@@ -17,7 +17,9 @@
 # If you make changes to this Dockerfile run `make builder-image-push`.
 
 # Install Lychee
-FROM docker.io/library/alpine:3.19.0@sha256:13b7e62e8df80264dbb747995705a986aa530415763a6c58f84a3ca8af9a5bcd as lychee
+FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as lychee
+# update: datasource=github-tags depName=lycheeverse/lychee versioning=semver
+ENV LYCHEE_VERSION="v0.14.3"
 # hadolint ignore=DL3018
 # update: datasource=github-tags depName=lycheeverse/lychee versioning=semver
 ENV LYCHEE_VERSION="v0.14.3"
@@ -56,9 +58,9 @@ RUN apk add -U --no-cache \
     trivy=~${TRIVY_VERSION#v} 
 
 # Install Golang CI Lint
-FROM docker.io/library/alpine:3.19.1 as golangci
+FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as golangci
 # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver
-ENV GOLANGCI_VERSION="v1.55.2"
+ENV GOLANGCI_VERSION="v1.56.2"
 WORKDIR /
 # hadolint ignore=DL3018,DL4006
 RUN apk add --no-cache curl && \
@@ -67,13 +69,16 @@ RUN apk add --no-cache curl && \
 # Install Hadolint
 FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint
 
+# Install Trivy
+FROM docker.io/aquasec/trivy:0.49.1@sha256:026a1ab5714dd19ffde0aed18ac034d1d354f119d6e62330cd6522081dd74628 as trivy
+
 ############################
 # CSO Build Image Base #
 ############################
 FROM docker.io/library/golang:1.21.6-bullseye
 
 # update: datasource=github-tags depName=adrienverge/yamllint versioning=semver
-ENV YAMLLINT_VERSION="v1.33.0"
+ENV YAMLLINT_VERSION="v1.35.1"
 # update: datasource=github-tags depName=opt-nc/yamlfixer versioning=semver
 ENV YAMLFIXER_VERSION="0.9.15"