Skip to content

Commit bc0d392

Browse files
authored
Add Docker buildx tool to standard:7.0 (#626)
* Add Docker buildx tool to standard:7.0 * Fix docker-buildx binary location
1 parent c5379f4 commit bc0d392

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

ubuntu/standard/7.0/Dockerfile

+8-2
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ ARG DOCKER_BUCKET="download.docker.com"
327327
ARG DOCKER_CHANNEL="stable"
328328
ARG DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034"
329329
ARG DOCKER_COMPOSE_VERSION="2.17.2"
330+
ARG DOCKER_BUILDX_VERSION="0.10.4"
330331
ARG SRC_DIR="/usr/src"
331332

332333
ARG DOCKER_SHA256="ec8a71e79125d3ca76f7cc295f35eea225f4450e0ffe0775f103e2952ff580f6"
@@ -346,9 +347,14 @@ RUN set -ex \
346347
&& echo 'dockremap:165536:65536' >> /etc/subgid \
347348
&& wget -q "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \
348349
&& curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 > /usr/local/bin/docker-compose \
349-
&& chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose \
350+
# Add docker buildx tool
351+
&& mkdir -p /usr/local/lib/docker/cli-plugins \
352+
&& curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 > /usr/local/lib/docker/cli-plugins/docker-buildx \
353+
&& chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose /usr/local/lib/docker/cli-plugins/docker-buildx \
350354
# Ensure docker-compose works
351-
&& docker-compose version
355+
&& docker-compose version \
356+
# Ensure docker-buildx works
357+
&& /usr/local/lib/docker/cli-plugins/docker-buildx version
352358

353359
VOLUME /var/lib/docker
354360
#*********************** END DOCKER ****************************

0 commit comments

Comments
 (0)