From 2213776f0e780be3f852502a342e2aadc95c7ecc Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 3 Oct 2023 16:24:24 -0400 Subject: [PATCH 1/2] add `buildx` to images --- images/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/images/Dockerfile b/images/Dockerfile index 5ac45e95c4b..d4155a0f8fa 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -6,6 +6,7 @@ ARG TARGETARCH ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION=0.4.0 ARG DOCKER_VERSION=24.0.6 +ARG BUILDX_VERSION=0.11.2 RUN apt update -y && apt install curl unzip -y @@ -25,7 +26,11 @@ RUN export RUNNER_ARCH=${TARGETARCH} \ && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \ && curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \ && tar zxvf docker.tgz \ - && rm -rf docker.tgz + && rm -rf docker.tgz \ + && mkdir -p /usr/local/lib/docker/cli-plugins \ + && curl -Lo /usr/local/lib/docker/cli-plugins/docker-buildx \ + "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \ + && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy From bee67cf9027e1ccc00164c628f1794c1b3b84bfc Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Mon, 23 Oct 2023 13:30:27 -0400 Subject: [PATCH 2/2] Update Dockerfile --- images/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/Dockerfile b/images/Dockerfile index d4155a0f8fa..a4d33bda52d 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -28,7 +28,7 @@ RUN export RUNNER_ARCH=${TARGETARCH} \ && tar zxvf docker.tgz \ && rm -rf docker.tgz \ && mkdir -p /usr/local/lib/docker/cli-plugins \ - && curl -Lo /usr/local/lib/docker/cli-plugins/docker-buildx \ + && curl -fLo /usr/local/lib/docker/cli-plugins/docker-buildx \ "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \ && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx