Skip to content

Commit 1524b57

Browse files
committed
feat: update the cached dependencies and the dockerfile deps
Signed-off-by: Nathan Klick <nathan@swirldslabs.com> # Conflicts: # .github/workflows/zxc-build-scaleset-images.yaml
1 parent cb4e384 commit 1524b57

File tree

2 files changed

+13
-37
lines changed

2 files changed

+13
-37
lines changed

.github/workflows/zxc-build-scaleset-images.yaml

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -135,60 +135,35 @@ jobs:
135135
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
136136
with:
137137
distribution: temurin
138-
java-version: "21.0.1"
139-
140-
- name: Setup NodeJS 16
141-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
142-
with:
143-
node-version: 16
144-
145-
- name: Setup NodeJS 18
146-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
147-
with:
148-
node-version: 18
149-
150-
- name: Setup NodeJS 19
151-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
152-
with:
153-
node-version: 19
154-
155-
- name: Setup NodeJS 20
156-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
157-
with:
158-
node-version: 20
138+
java-version: "25"
159139

160140
- name: Setup NodeJS 22
161141
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
162142
with:
163143
node-version: 22
164144

165-
- name: Setup GoLang 1.20
166-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
145+
- name: Setup NodeJS 24
146+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
167147
with:
168-
go-version: "1.20"
148+
node-version: 24
169149

170-
- name: Setup GoLang 1.21.0
150+
- name: Setup GoLang 1.25
171151
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
172152
with:
173-
go-version: "1.21.0"
153+
go-version: "1.25"
174154

175155
- name: Setup Kind
176156
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
177157
with:
178158
install_only: true
179159

180-
- name: Setup Helm v3.12.3
181-
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
182-
with:
183-
version: "v3.12.3" # helm version
184-
185160
- name: Setup Helm Latest
186161
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
187162

188163
- name: Setup Docker Buildx Support
189164
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
190165
with:
191-
version: v0.16.2
166+
version: v0.30.1
192167
driver-opts: network=host
193168

194169
- name: Setup Terraform
@@ -236,7 +211,7 @@ jobs:
236211
- name: Setup Docker Buildx Support
237212
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
238213
with:
239-
version: v0.16.2
214+
version: v0.30.1
240215
driver-opts: network=host
241216

242217
- name: Show Docker Version
@@ -291,3 +266,4 @@ jobs:
291266
DOCKER_VERSION=${{ inputs.docker-version }}
292267
BUILDX_VERSION=${{ inputs.docker-buildx-version }}
293268
GH_CLI_VERSION=${{ inputs.gh-cli-version }}
269+
BASE_OS_VERSION=${{ case(inputs.base-os-image == "debian-bookworm", "bookworm-slim", inputs.base-os-image) }}

scaleset/runner/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ FROM mcr.microsoft.com/dotnet/runtime-deps:${DOTNET_RUNTIME_VERSION}-${BASE_OS_V
3939
ENV DEBIAN_FRONTEND=noninteractive
4040
ENV RUNNER_MANUALLY_TRAP_SIG=1
4141
ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1
42-
ENV ImageOS=ubuntu22
42+
ENV ImageOS=${BASE_OS_VERSION}
4343

4444
# 'gpg-agent' and 'software-properties-common' are needed for the 'add-apt-repository' command that follows
4545
RUN apt update -y \
@@ -102,21 +102,21 @@ RUN curl -fL https://install-cli.jfrog.io | sh \
102102
&& chmod +x /usr/local/bin/semver
103103

104104
ARG TARGET_ARCH
105-
ARG GH_CLI_VERSION=2.54.0
105+
ARG GH_CLI_VERSION=2.86.0
106106
RUN export ARCH=${TARGET_ARCH} \
107107
&& if [ "${ARCH}" = "i386" ]; then export ARCH=386 ; fi \
108108
&& curl -sL https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_${ARCH}.tar.gz \
109109
| tar -xz --wildcards --strip-components=2 -C /usr/local/bin "*/bin/gh" \
110110
&& chmod +x /usr/local/bin/gh
111111

112-
ARG YQ_CLI_VERSION=4.44.3
112+
ARG YQ_CLI_VERSION=4.52.2
113113
RUN export ARCH=${TARGET_ARCH} \
114114
&& if [ "${ARCH}" = "i386" ]; then export ARCH=386 ; fi \
115115
&& curl -fLo /usr/local/bin/yq \
116116
"https://github.com/mikefarah/yq/releases/download/v${YQ_CLI_VERSION}/yq_linux_${ARCH}" \
117117
&& chmod +x /usr/local/bin/yq
118118

119-
ARG COMPOSE_VERSION=2.29.2
119+
ARG COMPOSE_VERSION=2.40.3
120120
RUN export RUNNER_ARCH=${TARGET_ARCH} \
121121
&& if [ "${RUNNER_ARCH}" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \
122122
&& if [ "${RUNNER_ARCH}" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \

0 commit comments

Comments
 (0)