Skip to content

Commit fe11da4

Browse files
authored
Use wait-for-docker from upstream (#2243)
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
1 parent b515379 commit fe11da4

File tree

4 files changed

+8
-27
lines changed

4 files changed

+8
-27
lines changed

cluster/images/splice-test-docker-runner/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Note that we don't currently support arm64 runners, so we build this only for amd64
2-
FROM --platform=$BUILDPLATFORM ghcr.io/actions/actions-runner:2.326.0@sha256:9c3383600872325f21951a0a1a8ae640361ff5e1abdf1f2900de8ba1cfd915e9
2+
FROM --platform=$BUILDPLATFORM ghcr.io/actions/actions-runner:2.328.0@sha256:db0dcae6d28559e54277755a33aba7d0665f255b3bd2a66cdc5e132712f155e0
33

4-
LABEL org.opencontainers.image.base.name="ghcr.io/actions/actions-runner:2.326.0"
4+
LABEL org.opencontainers.image.base.name="ghcr.io/actions/actions-runner:2.328.0"
55
#Ideally, we'd reduce duplication between this and splice-test-ci, but we're not tackling that right now
66

77
RUN sudo apt-get update && \
@@ -15,5 +15,3 @@ RUN sudo ln -s /usr/bin/python3 /usr/bin/python
1515
ENV COURSIER_CACHE=/cache/coursier
1616

1717
COPY target/LICENSE .
18-
RUN mv /home/runner/run.sh /home/runner/run-base.sh
19-
COPY run.sh /home/runner/run.sh

cluster/images/splice-test-docker-runner/run.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Note that we don't currently support arm64 runners, so we build this only for amd64
2-
FROM --platform=$BUILDPLATFORM ghcr.io/actions/actions-runner:2.326.0@sha256:9c3383600872325f21951a0a1a8ae640361ff5e1abdf1f2900de8ba1cfd915e9
2+
FROM --platform=$BUILDPLATFORM ghcr.io/actions/actions-runner:2.328.0@sha256:db0dcae6d28559e54277755a33aba7d0665f255b3bd2a66cdc5e132712f155e0
33

4-
LABEL org.opencontainers.image.base.name="ghcr.io/actions/actions-runner:2.326.0"
4+
LABEL org.opencontainers.image.base.name="ghcr.io/actions/actions-runner:2.328.0"
55

66
COPY target/index.js /home/runner/k8s/index.js
77
COPY target/LICENSE .

cluster/pulumi/gha/src/runners.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,10 @@ function installDockerRunnerScaleSet(
193193
name: 'DOCKER_HOST',
194194
value: 'unix:///var/run/docker.sock',
195195
},
196+
{
197+
name: 'RUNNER_WAIT_FOR_DOCKER_IN_SECONDS',
198+
value: '120',
199+
},
196200
],
197201
resources,
198202
// required to mount the nix store inside the container from the NFS

0 commit comments

Comments
 (0)