🌱 Update Builder Image group (#1328)

* 🌱 Update Builder Image group | datasource | package | from | to | | ----------- | ------------------------ | ------- | ------- | | docker | docker.io/aquasec/trivy | 0.51.1 | 0.52.1 | | docker | docker.io/library/alpine | 3.19.1 | 3.20.0 | | github-tags | golangci/golangci-lint | v1.58.1 | v1.59.1 | Signed-off-by: kranurag7 <anurag.kumar@syself.com> --------- Signed-off-by: kranurag7 <anurag.kumar@syself.com> Co-authored-by: syself-bot[bot] <115953087+syself-bot[bot]@users.noreply.github.com> Co-authored-by: kranurag7 <anurag.kumar@syself.com>
syself · Jun 19, 2024 · e88d271 · e88d271
1 parent 8e92c2c
commit e88d271
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.builder-image-version.txt b/.builder-image-version.txt
@@ -1 +1 @@
-1.0.17
+1.0.18
diff --git a/.github/workflows/main-promote-builder-image.yml b/.github/workflows/main-promote-builder-image.yml
@@ -10,7 +10,7 @@ jobs:
     name: Promote Latest tag to Caph Builder Image
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.17
+      image: ghcr.io/syself/caph-builder:1.0.18
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
@@ -23,7 +23,7 @@ jobs:
     if: github.event_name != 'pull_request_target' || !github.event.pull_request.draft
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.17
+      image: ghcr.io/syself/caph-builder:1.0.18
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'syself/cluster-api-provider-hetzner'
     container:
-      image: ghcr.io/syself/caph-builder:1.0.17
+      image: ghcr.io/syself/caph-builder:1.0.18
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git 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
@@ -28,9 +28,9 @@ RUN apk add --no-cache curl && \
     rm -rf /tmp/linux-amd64 /tmp/lychee-${LYCHEE_VERSION}.tgz
 
 # 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.58.1"
+ENV GOLANGCI_VERSION="v1.59.1"
 WORKDIR /
 # hadolint ignore=DL3018,DL4006
 RUN apk add --no-cache curl && \
@@ -40,7 +40,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.52.1@sha256:fccab5c313e08e38c12ee4331641de03ac2f8824fd6d41b7dd9ee1a6c2d3680b as trivy
 
 ############################
 # Caph Build Image Base #

diff --git a/test/e2e/log_collector.go b/test/e2e/log_collector.go
@@ -89,7 +89,7 @@ func (collector logCollector) CollectMachineLog(_ context.Context, _ client.Clie
 				return fmt.Errorf("failed to tar dir %s: %w", pathToDir, err)
 			}
 
-			err = os.MkdirAll(outputDir, os.ModePerm)
+			err = os.MkdirAll(outputDir, os.ModePerm) //nolint:gosec //nolint:ignore
 			if err != nil {
 				return err
 			}
@@ -122,7 +122,7 @@ func (collector logCollector) CollectMachineLog(_ context.Context, _ client.Clie
 }
 
 func createOutputFile(path string) (*os.File, error) {
-	if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
+	if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil { //nolint:gosec //nolint:ignore
 		return nil, err
 	}
 	return os.Create(path) // #nosec