Skip to content

Commit c8d1a71

Browse files
authored
Merge branch 'main' into renovate/major-22-github-actions
2 parents 22a22c3 + cdbcc97 commit c8d1a71

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

.github/workflows/schedule-update-bot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
echo "LOG_LEVEL=${{ github.event.inputs.logLevel || env.LOG_LEVEL }}" >> "$GITHUB_ENV"
4646
4747
- name: Renovate
48-
uses: renovatebot/github-action@02f4fdeb479bbb229caa7ad82cb5e691c07e80b3 # v41.0.14
48+
uses: renovatebot/github-action@822441559e94f98b67b82d97ab89fe3003b0a247 # v44.2.0
4949
env:
5050
RENOVATE_HOST_RULES: '[{"hostType": "docker", "matchHost": "ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
5151
RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '[".*"]'

images/builder/Dockerfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ FROM docker.io/library/alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa46
2222
ENV LYCHEE_VERSION="v0.15.1"
2323
# hadolint ignore=DL3018
2424
RUN apk add --no-cache curl && \
25-
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 && \
26-
tar -xz -C /tmp -f /tmp/lychee-${LYCHEE_VERSION}.tgz && \
27-
mv /tmp/lychee /usr/bin/lychee && \
28-
rm -rf /tmp/linux-amd64 /tmp/lychee-${LYCHEE_VERSION}.tgz
25+
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 && \
26+
tar -xz -C /tmp -f /tmp/lychee-${LYCHEE_VERSION}.tgz && \
27+
mv /tmp/lychee /usr/bin/lychee && \
28+
rm -rf /tmp/linux-amd64 /tmp/lychee-${LYCHEE_VERSION}.tgz
2929

3030
# Install Golang CI Lint
3131
FROM docker.io/library/alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c as golangci
@@ -34,7 +34,7 @@ ENV GOLANGCI_VERSION="v1.64.5"
3434
WORKDIR /
3535
# hadolint ignore=DL3018,DL4006
3636
RUN apk add --no-cache curl && \
37-
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_VERSION}
37+
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_VERSION}
3838

3939
# Install Hadolint
4040
FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:3c206a451cec6d486367e758645269fd7d696c5ccb6ff59d8b03b0e45268a199 as hadolint
@@ -45,7 +45,7 @@ FROM docker.io/aquasec/trivy:0.59.1@sha256:029e990b328d149bf0a9ffe355919041e1f86
4545
############################
4646
# csctl Build Image Base #
4747
############################
48-
FROM docker.io/library/golang:1.21.6-bullseye@sha256:c62751ac12cad0c514d941e36f846c1c440ca9e8ec08dd87d022fb03f0887a9b
48+
FROM docker.io/library/golang:1.22-bullseye
4949

5050
# update: datasource=repology depName=debian_11/skopeo versioning=loose
5151
ENV SKOPEO_VERSION="1.2.2+dfsg1-1+b6"
@@ -56,16 +56,16 @@ ENV YAMLFIXER_VERSION="0.9.15"
5656

5757
# hadolint ignore=DL3008
5858
RUN apt-get update && \
59-
apt-get install -qy --no-install-recommends \
60-
gnupg python3 python3-pip \
61-
file zip unzip jq gettext \
62-
skopeo=${SKOPEO_VERSION} \
63-
protobuf-compiler libprotobuf-dev \
64-
libsystemd-dev jq && \
65-
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
66-
pip install --no-cache-dir \
67-
yamllint==${YAMLLINT_VERSION} \
68-
yamlfixer-opt-nc==${YAMLFIXER_VERSION}
59+
apt-get install -qy --no-install-recommends \
60+
gnupg python3 python3-pip \
61+
file zip unzip jq gettext \
62+
skopeo=${SKOPEO_VERSION} \
63+
protobuf-compiler libprotobuf-dev \
64+
libsystemd-dev jq && \
65+
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
66+
pip install --no-cache-dir \
67+
yamllint==${YAMLLINT_VERSION} \
68+
yamlfixer-opt-nc==${YAMLFIXER_VERSION}
6969

7070
COPY --from=lychee /usr/bin/lychee /usr/bin/lychee
7171
COPY --from=golangci /bin/golangci-lint /usr/local/bin

0 commit comments

Comments
 (0)