From 520bef1af3928eaf334c105e6572d95d9c061458 Mon Sep 17 00:00:00 2001 From: keskiju Date: Sun, 1 Dec 2024 13:51:37 +0200 Subject: [PATCH] Revert "feat: buildx not needed on CI/CD after all" This reverts commit 03dc848c7d4070a07220c5331c3414193aa17e69. --- Dockerfile-ci | 3 +++ Dockerfile-cli | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile-ci b/Dockerfile-ci index fcdd019..3da26ac 100644 --- a/Dockerfile-ci +++ b/Dockerfile-ci @@ -6,6 +6,9 @@ RUN /taito-cli-deps/tools/install-ci-tools.sh # Install Docker for executing docker builds RUN /taito-cli-deps/tools/install-docker-bin.sh +# Install Docker buildx for docker buildx commands +RUN /taito-cli-deps/tools/install-docker-buildx.sh + # Install Docker Compose for running integration test suites RUN /taito-cli-deps/tools/install-docker-compose.sh diff --git a/Dockerfile-cli b/Dockerfile-cli index 307f1b1..ac64c0c 100644 --- a/Dockerfile-cli +++ b/Dockerfile-cli @@ -53,8 +53,9 @@ RUN /taito-cli-deps/tools/install-openshift-cli.sh # Install Argo CLI RUN /taito-cli-deps/tools/install-argo-cli.sh -# Install docker (required for executing CI/CD builds on container) +# Install docker and buildx (required for executing CI/CD builds on container) RUN /taito-cli-deps/tools/install-docker-bin.sh +RUN /taito-cli-deps/tools/install-docker-buildx.sh # Install ci tools RUN /taito-cli-deps/tools/install-ci-tools.sh