Skip to content

Commit 3ffaad9

Browse files
authored
Merge pull request #95 from SovereignCloudStack/renovate/cso-builder-image
🌱 Update Builder Image group
2 parents fa182cb + 9929be2 commit 3ffaad9

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

.builder-image-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0
1+
1.1.1

.github/workflows/pr-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
2222
runs-on: ubuntu-latest
2323
container:
24-
image: ghcr.io/sovereigncloudstack/cso-builder:1.0.1
24+
image: ghcr.io/sovereigncloudstack/cso-builder:1.1.1
2525
credentials:
2626
username: ${{ github.actor }}
2727
password: ${{ secrets.github_token }}

.github/workflows/schedule-scan-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Trivy
1010
runs-on: ubuntu-latest
1111
container:
12-
image: ghcr.io/sovereigncloudstack/cso-builder:1.0.1
12+
image: ghcr.io/sovereigncloudstack/cso-builder:1.1.1
1313
credentials:
1414
username: ${{ github.actor }}
1515
password: ${{ secrets.github_token }}

images/builder/Dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +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.0@sha256:13b7e62e8df80264dbb747995705a986aa530415763a6c58f84a3ca8af9a5bcd as lychee
20+
FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as lychee
21+
# update: datasource=github-tags depName=lycheeverse/lychee versioning=semver
22+
ENV LYCHEE_VERSION="v0.14.3"
2123
# hadolint ignore=DL3018
2224
# update: datasource=github-tags depName=lycheeverse/lychee versioning=semver
2325
ENV LYCHEE_VERSION="v0.14.3"
@@ -56,9 +58,9 @@ RUN apk add -U --no-cache \
5658
trivy=~${TRIVY_VERSION#v}
5759

5860
# Install Golang CI Lint
59-
FROM docker.io/library/alpine:3.19.1 as golangci
61+
FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as golangci
6062
# update: datasource=github-tags depName=golangci/golangci-lint versioning=semver
61-
ENV GOLANGCI_VERSION="v1.55.2"
63+
ENV GOLANGCI_VERSION="v1.56.2"
6264
WORKDIR /
6365
# hadolint ignore=DL3018,DL4006
6466
RUN apk add --no-cache curl && \
@@ -67,13 +69,16 @@ RUN apk add --no-cache curl && \
6769
# Install Hadolint
6870
FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint
6971

72+
# Install Trivy
73+
FROM docker.io/aquasec/trivy:0.49.1@sha256:026a1ab5714dd19ffde0aed18ac034d1d354f119d6e62330cd6522081dd74628 as trivy
74+
7075
############################
7176
# CSO Build Image Base #
7277
############################
7378
FROM docker.io/library/golang:1.21.6-bullseye
7479

7580
# update: datasource=github-tags depName=adrienverge/yamllint versioning=semver
76-
ENV YAMLLINT_VERSION="v1.33.0"
81+
ENV YAMLLINT_VERSION="v1.35.1"
7782
# update: datasource=github-tags depName=opt-nc/yamlfixer versioning=semver
7883
ENV YAMLFIXER_VERSION="0.9.15"
7984

0 commit comments

Comments
 (0)