Skip to content

Commit 45a36b7

Browse files
Use uname -m instead of ARCH var
1 parent 1cc9efe commit 45a36b7

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ ARG VPNKIT_VERSION=0.5.0
66
ARG PASST_VERSION=2025_02_17.a1e48a0
77
ARG DOCKER_VERSION=28.0.1
88
ARG DOCKER_CHANNEL=stable
9-
# also tested with aarch64
10-
ARG ARCH=x86_64
11-
129

1310
FROM golang:${GO_VERSION}-alpine AS build
1411
RUN apk add --no-cache file git make
@@ -80,8 +77,7 @@ RUN /sbin/setcap cap_setuid+eip /usr/bin/newuidmap && \
8077
COPY --from=artifact /rootlesskit /home/user/bin/
8178
COPY --from=artifact /rootlessctl /home/user/bin/
8279
ARG SLIRP4NETNS_VERSION
83-
ARG ARCH
84-
RUN curl -sSL -o /home/user/bin/slirp4netns https://github.com/rootless-containers/slirp4netns/releases/download/${SLIRP4NETNS_VERSION}/slirp4netns-${ARCH} && \
80+
RUN curl -sSL -o /home/user/bin/slirp4netns https://github.com/rootless-containers/slirp4netns/releases/download/${SLIRP4NETNS_VERSION}/slirp4netns-$(uname -m) && \
8581
chmod +x /home/user/bin/slirp4netns
8682
COPY --from=vpnkit /vpnkit /home/user/bin/vpnkit
8783
COPY --from=passt /usr/local /usr/local
@@ -98,8 +94,7 @@ WORKDIR /home/user/hack
9894
FROM test-integration AS test-integration-docker
9995
ARG DOCKER_VERSION
10096
ARG DOCKER_CHANNEL
101-
ARG ARCH
102-
RUN curl -fsSL https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${ARCH}/docker-${DOCKER_VERSION}.tgz | tar xz --strip-components=1 -C /home/user/bin/
97+
RUN curl -fsSL https://download.docker.com/linux/static/${DOCKER_CHANNEL}/$(uname -m)/docker-${DOCKER_VERSION}.tgz | tar xz --strip-components=1 -C /home/user/bin/
10398
RUN curl -fsSL -o /home/user/bin/dockerd-rootless.sh https://raw.githubusercontent.com/moby/moby/v${DOCKER_VERSION}/contrib/dockerd-rootless.sh && \
10499
chmod +x /home/user/bin/dockerd-rootless.sh
105100
# rootlesskit-docker-proxy is no longer needed since Docker v28

0 commit comments

Comments
 (0)