From b8ae79b0d8dbe607e0ba5605b2c5269e94872bd8 Mon Sep 17 00:00:00 2001 From: i4M1k0SU Date: Thu, 25 May 2023 14:39:01 +0900 Subject: [PATCH 1/4] Add Docker buildx tool to al2/aarch64/standard:3.0 --- al2/aarch64/standard/3.0/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/al2/aarch64/standard/3.0/Dockerfile b/al2/aarch64/standard/3.0/Dockerfile index 32cb813a..02602b23 100644 --- a/al2/aarch64/standard/3.0/Dockerfile +++ b/al2/aarch64/standard/3.0/Dockerfile @@ -283,6 +283,7 @@ ENV DOCKER_BUCKET="download.docker.com" \ ENV DOCKER_SHA256="3865F837DBD951B19EEB5F7D87AADA2E865B2017E9462FE389F0E5D9A438324D" ENV DOCKER_VERSION="23.0.1" ENV DOCKER_COMPOSE_VERSION="2.17.2" +ENV DOCKER_BUILDX_VERSION="0.10.5" VOLUME /var/lib/docker @@ -302,7 +303,12 @@ RUN set -ex \ && curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-aarch64 > /usr/local/bin/docker-compose \ && chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose \ # Ensure docker-compose works - && docker-compose version + && docker-compose version \ + # Add docker buildx tool + && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-arm64 -o /usr/local/bin/docker-buildx \ + && chmod +x /usr/local/bin/docker-buildx \ + # Ensure docker-buildx works + && docker-buildx version #=======================End of layer: runtimes_2 ================= FROM runtimes_2 AS runtimes_3 From aea752dfd295d218fc036af0180fdb5d5dd3318f Mon Sep 17 00:00:00 2001 From: i4M1k0SU Date: Fri, 30 Jun 2023 16:50:24 +0900 Subject: [PATCH 2/4] Update buildx version --- al2/aarch64/standard/3.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/al2/aarch64/standard/3.0/Dockerfile b/al2/aarch64/standard/3.0/Dockerfile index 03d9c8e2..0228ffa0 100644 --- a/al2/aarch64/standard/3.0/Dockerfile +++ b/al2/aarch64/standard/3.0/Dockerfile @@ -283,7 +283,7 @@ ENV DOCKER_BUCKET="download.docker.com" \ ENV DOCKER_SHA256="3865F837DBD951B19EEB5F7D87AADA2E865B2017E9462FE389F0E5D9A438324D" ENV DOCKER_VERSION="23.0.1" ENV DOCKER_COMPOSE_VERSION="2.17.2" -ENV DOCKER_BUILDX_VERSION="0.10.5" +ENV DOCKER_BUILDX_VERSION="0.11.0" VOLUME /var/lib/docker From 2c3887660ec9c64d725ac977db6ab755d0bc3b72 Mon Sep 17 00:00:00 2001 From: i4M1k0SU Date: Fri, 30 Jun 2023 16:51:14 +0900 Subject: [PATCH 3/4] Change paths for docker plugins --- al2/aarch64/standard/3.0/Dockerfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/al2/aarch64/standard/3.0/Dockerfile b/al2/aarch64/standard/3.0/Dockerfile index 0228ffa0..c9242d0a 100644 --- a/al2/aarch64/standard/3.0/Dockerfile +++ b/al2/aarch64/standard/3.0/Dockerfile @@ -300,15 +300,22 @@ RUN set -ex \ && echo 'dockremap:165536:65536' >> /etc/subuid \ && echo 'dockremap:165536:65536' >> /etc/subgid \ && wget -q "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \ - && curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-aarch64 > /usr/local/bin/docker-compose \ - && chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose \ - # Ensure docker-compose works + && chmod +x /usr/local/bin/dind \ + # Install docker compose as docker plugin and maintain docker-compose usage + && mkdir -p /usr/local/lib/docker/cli-plugins \ + && curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-aarch64 > /usr/local/lib/docker/cli-plugins/docker-compose \ + && chmod +x /usr/local/lib/docker/cli-plugins/docker-compose \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose \ + # Ensure docker-compose and docker compose works && docker-compose version \ + && docker compose version \ # Add docker buildx tool - && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-arm64 -o /usr/local/bin/docker-buildx \ - && chmod +x /usr/local/bin/docker-buildx \ - # Ensure docker-buildx works - && docker-buildx version + && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-arm64 -o /usr/local/lib/docker/cli-plugins/docker-buildx \ + && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-buildx /usr/local/bin/docker-buildx \ + # Ensure docker-buildx and docker buildx works + && docker-buildx version \ + && docker buildx version #=======================End of layer: runtimes_2 ================= FROM runtimes_2 AS runtimes_3 From 9b2df3c198c5d1843da5d3421e06c14180c4c6e9 Mon Sep 17 00:00:00 2001 From: i4M1k0SU Date: Tue, 29 Aug 2023 06:52:10 +0900 Subject: [PATCH 4/4] Update buildx version --- al2/aarch64/standard/3.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/al2/aarch64/standard/3.0/Dockerfile b/al2/aarch64/standard/3.0/Dockerfile index c9242d0a..4ae86514 100644 --- a/al2/aarch64/standard/3.0/Dockerfile +++ b/al2/aarch64/standard/3.0/Dockerfile @@ -283,7 +283,7 @@ ENV DOCKER_BUCKET="download.docker.com" \ ENV DOCKER_SHA256="3865F837DBD951B19EEB5F7D87AADA2E865B2017E9462FE389F0E5D9A438324D" ENV DOCKER_VERSION="23.0.1" ENV DOCKER_COMPOSE_VERSION="2.17.2" -ENV DOCKER_BUILDX_VERSION="0.11.0" +ENV DOCKER_BUILDX_VERSION="0.11.2" VOLUME /var/lib/docker