From 9e01fcaacb5cbe757b2692a096342120015225db Mon Sep 17 00:00:00 2001 From: John Wright Date: Mon, 3 Jun 2024 17:33:41 +0100 Subject: [PATCH] fix: correct buildx version --- images/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index 79b06621389..98ff3717ce2 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -6,7 +6,7 @@ ARG TARGETARCH ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 ARG DOCKER_VERSION=25.0.5 -ARG BUILDX_VERSION=0.13.2 +ARG BUILDX_VERSION=0.14.1 RUN apt update -y && apt install curl unzip -y @@ -23,14 +23,14 @@ RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-c RUN export RUNNER_ARCH=${TARGETARCH} \ && if [ "$RUNNER_ARCH" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \ - && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi -RUN curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz -RUN tar zxvf docker.tgz -RUN rm -rf docker.tgz \ - && mkdir -p /usr/local/lib/docker/cli-plugins -RUN 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}" -RUN chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx + && 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 \ + && mkdir -p /usr/local/lib/docker/cli-plugins \ + && 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 FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy