From 2efda20c778940bf0ac096dcc435da74583378c6 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Wed, 6 Sep 2023 11:12:03 +0200 Subject: [PATCH] packaging: do not install docker-compose-plugin for s390x|ppc64le This PR is to skip installing docker-compose-plugin while buiding a `build-kata-deploy` image for s390x|ppc64le. It is a temporary solution to fix current CI failures for s390x regarding `hash sum mismatch`. Fixes: #7848 Signed-off-by: Hyounggyu Choi --- tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile b/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile index 569a4ffdb5..51e7ba4311 100644 --- a/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile +++ b/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile @@ -19,7 +19,8 @@ RUN apt-get update && \ apt-get clean && rm -rf /var/lib/apt/lists/ && \ install_yq.sh && \ curl -fsSL https://get.docker.com -o get-docker.sh && \ - if uname -m | grep -Eq 's390x|ppc64le'; then export VERSION="v20.10"; fi && \ + if uname -m | grep -Eq 's390x|ppc64le'; then export VERSION="v20.10" && \ + sed -i 's/\//g' get-docker.sh; fi && \ sh get-docker.sh ARG IMG_USER=kata-builder