Skip to content

Commit 968358d

Browse files
Parameter for ISA of binaries
To run it in Ubuntu VM on MAC Mx, taishan/kunpeng, thunder x servers. Signed-off-by: Alexey Perevalov <[email protected]>
1 parent 530859a commit 968358d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ RUN /sbin/setcap cap_setuid+eip /usr/bin/newuidmap && \
7777
COPY --from=artifact /rootlesskit /home/user/bin/
7878
COPY --from=artifact /rootlessctl /home/user/bin/
7979
ARG SLIRP4NETNS_VERSION
80-
RUN curl -sSL -o /home/user/bin/slirp4netns https://github.com/rootless-containers/slirp4netns/releases/download/${SLIRP4NETNS_VERSION}/slirp4netns-x86_64 && \
80+
RUN curl -sSL -o /home/user/bin/slirp4netns https://github.com/rootless-containers/slirp4netns/releases/download/${SLIRP4NETNS_VERSION}/slirp4netns-$(uname -m) && \
8181
chmod +x /home/user/bin/slirp4netns
8282
COPY --from=vpnkit /vpnkit /home/user/bin/vpnkit
8383
COPY --from=passt /usr/local /usr/local
@@ -94,7 +94,7 @@ WORKDIR /home/user/hack
9494
FROM test-integration AS test-integration-docker
9595
ARG DOCKER_VERSION
9696
ARG DOCKER_CHANNEL
97-
RUN curl -fsSL https://download.docker.com/linux/static/${DOCKER_CHANNEL}/x86_64/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/
9898
RUN curl -fsSL -o /home/user/bin/dockerd-rootless.sh https://raw.githubusercontent.com/moby/moby/v${DOCKER_VERSION}/contrib/dockerd-rootless.sh && \
9999
chmod +x /home/user/bin/dockerd-rootless.sh
100100
# rootlesskit-docker-proxy is no longer needed since Docker v28

0 commit comments

Comments
 (0)