You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: Dockerfile
+2-7Lines changed: 2 additions & 7 deletions
Original file line number
Diff line number
Diff line change
@@ -6,9 +6,6 @@ ARG VPNKIT_VERSION=0.5.0
6
6
ARG PASST_VERSION=2025_02_17.a1e48a0
7
7
ARG DOCKER_VERSION=28.0.1
8
8
ARG DOCKER_CHANNEL=stable
9
-
# also tested with aarch64
10
-
ARG ARCH=x86_64
11
-
12
9
13
10
FROM golang:${GO_VERSION}-alpine AS build
14
11
RUN apk add --no-cache file git make
@@ -80,8 +77,7 @@ RUN /sbin/setcap cap_setuid+eip /usr/bin/newuidmap && \
80
77
COPY --from=artifact /rootlesskit /home/user/bin/
81
78
COPY --from=artifact /rootlessctl /home/user/bin/
82
79
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) && \
85
81
chmod +x /home/user/bin/slirp4netns
86
82
COPY --from=vpnkit /vpnkit /home/user/bin/vpnkit
87
83
COPY --from=passt /usr/local /usr/local
@@ -98,8 +94,7 @@ WORKDIR /home/user/hack
98
94
FROM test-integration AS test-integration-docker
99
95
ARG DOCKER_VERSION
100
96
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/
103
98
RUN curl -fsSL -o /home/user/bin/dockerd-rootless.sh https://raw.githubusercontent.com/moby/moby/v${DOCKER_VERSION}/contrib/dockerd-rootless.sh && \
104
99
chmod +x /home/user/bin/dockerd-rootless.sh
105
100
# rootlesskit-docker-proxy is no longer needed since Docker v28
0 commit comments