Skip to content

Commit 8ce2eea

Browse files
cluster-stack-bot[bot]kranurag7jschoone
authored
🌱 Update Builder Image group (#110)
* 🌱 Update Builder Image group | datasource | package | from | to | | ----------- | ------------------------ | ------- | ------- | | github-tags | adrienverge/yamllint | v1.33.0 | v1.35.1 | | docker | docker.io/aquasec/trivy | 0.49.0 | 0.51.3 | | docker | docker.io/library/alpine | 3.19.1 | 3.20.0 | | github-tags | golangci/golangci-lint | v1.55.2 | v1.58.2 | | github-tags | lycheeverse/lychee | v0.14.2 | v0.15.1 | * fix lint warnings Signed-off-by: kranurag7 <[email protected]> --------- Signed-off-by: kranurag7 <[email protected]> Co-authored-by: cluster-stack-bot[bot] <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Co-authored-by: kranurag7 <[email protected]> Co-authored-by: Jan Schoone <[email protected]>
1 parent 3df95ce commit 8ce2eea

File tree

5 files changed

+12
-21
lines changed

5 files changed

+12
-21
lines changed

.builder-image-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.0
1+
0.2.1

.github/workflows/builder-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232
file: ./images/builder/Dockerfile
3333
context: ./images/builder
3434
push: true
35-
tags: ghcr.io/sovereigncloudstack/csctl-builder:0.2.0
35+
tags: ghcr.io/sovereigncloudstack/csctl-builder:0.2.1

.github/workflows/pr-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: github.event_name != 'pull_request_target' || !github.event.pull_request.draft
2020
runs-on: ubuntu-latest
2121
container:
22-
image: ghcr.io/sovereigncloudstack/csctl-builder:0.2.0
22+
image: ghcr.io/sovereigncloudstack/csctl-builder:0.2.1
2323
credentials:
2424
username: ${{ github.actor }}
2525
password: ${{ secrets.github_token }}

.golangci.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,7 @@ linters-settings:
8585
allow-unused: false
8686
allow-leading-space: false
8787
require-specific: true
88-
staticcheck:
89-
go: "1.21"
9088
stylecheck:
91-
go: "1.21"
9289
checks: ["all", "-ST1006"]
9390
dot-import-whitelist:
9491
- "github.com/onsi/gomega"
@@ -242,9 +239,6 @@ linters-settings:
242239
# Suggest the use of rpc.DefaultXXPath.
243240
# Default: false
244241
default-rpc-path: true
245-
# Suggest the use of os.DevNull.
246-
# Default: false
247-
os-dev-null: true
248242
# Suggest the use of sql.LevelXX.String().
249243
# Default: false
250244
sql-isolation-level: true
@@ -254,9 +248,6 @@ linters-settings:
254248
# Suggest the use of constant.Kind.String().
255249
# Default: false
256250
constant-kind: true
257-
# Suggest the use of syslog.Priority.
258-
# Default: false
259-
syslog-priority: true
260251
wrapcheck:
261252
ignoreSigs:
262253
- status.Error(
@@ -276,6 +267,9 @@ issues:
276267
# because we want to help reviewers to focus on reviewing the most relevant
277268
# changes in PRs and avoid nitpicking.
278269
exclude-use-default: false
270+
skip-dirs:
271+
- vendor$
272+
- test/vendor$
279273
exclude-rules:
280274
- linters:
281275
- wrapcheck
@@ -285,6 +279,3 @@ run:
285279
go: "1.21"
286280
allow-parallel-runners: true
287281
modules-download-mode: vendor
288-
skip-dirs:
289-
- vendor$
290-
- test/vendor$

images/builder/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
# If you make changes to this Dockerfile run `make builder-image-push`.
1818

1919
# Install Lychee
20-
FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as lychee
20+
FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as lychee
2121
# update: datasource=github-tags depName=lycheeverse/lychee versioning=semver
22-
ENV LYCHEE_VERSION="v0.14.2"
22+
ENV LYCHEE_VERSION="v0.15.1"
2323
# hadolint ignore=DL3018
2424
RUN apk add --no-cache curl && \
2525
curl -L -o /tmp/lychee-${LYCHEE_VERSION}.tgz https://github.com/lycheeverse/lychee/releases/download/${LYCHEE_VERSION}/lychee-${LYCHEE_VERSION}-x86_64-unknown-linux-gnu.tar.gz && \
@@ -28,9 +28,9 @@ RUN apk add --no-cache curl && \
2828
rm -rf /tmp/linux-amd64 /tmp/lychee-${LYCHEE_VERSION}.tgz
2929

3030
# Install Golang CI Lint
31-
FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as golangci
31+
FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as golangci
3232
# update: datasource=github-tags depName=golangci/golangci-lint versioning=semver
33-
ENV GOLANGCI_VERSION="v1.55.2"
33+
ENV GOLANGCI_VERSION="v1.58.2"
3434
WORKDIR /
3535
# hadolint ignore=DL3018,DL4006
3636
RUN apk add --no-cache curl && \
@@ -40,7 +40,7 @@ RUN apk add --no-cache curl && \
4040
FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint
4141

4242
# Install Trivy
43-
FROM docker.io/aquasec/trivy:0.49.0@sha256:c71420cd77f136e8e900f71d272fb89075f6011019bdcb4b5f7c8e4212f9025e as trivy
43+
FROM docker.io/aquasec/trivy:0.51.3@sha256:9e99f83e58db3f9338ded0bb25179e1d5849a1cbf2e90074a0c4a274f1d151e5 as trivy
4444

4545
############################
4646
# csctl Build Image Base #
@@ -50,7 +50,7 @@ FROM docker.io/library/golang:1.21.6-bullseye@sha256:a8712f27d9ac742e7bded8f81f7
5050
# update: datasource=repology depName=debian_11/skopeo versioning=loose
5151
ENV SKOPEO_VERSION="1.2.2+dfsg1-1+b6"
5252
# update: datasource=github-tags depName=adrienverge/yamllint versioning=semver
53-
ENV YAMLLINT_VERSION="v1.33.0"
53+
ENV YAMLLINT_VERSION="v1.35.1"
5454
# update: datasource=github-tags depName=opt-nc/yamlfixer versioning=semver
5555
ENV YAMLFIXER_VERSION="0.9.15"
5656

0 commit comments

Comments
 (0)