From f49b89b632e64d0cd72bbe39ed4b5f83abbfb0bb Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Fri, 3 Feb 2023 11:11:42 +0100 Subject: [PATCH] CI: Set docker version to v20.10 in ubuntu:20.04 for s390x|ppc64le This is to make a docker version to v20.10 in docker upstream image ubuntu:20.04 for s390x and ppc64le. Fixes: #6211 Signed-off-by: Hyounggyu Choi --- tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile b/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile index 06a4a93ac9..2ff5f5ae83 100644 --- a/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile +++ b/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile @@ -8,6 +8,7 @@ ENV INSTALL_IN_GOPATH=false COPY install_yq.sh /usr/bin/install_yq.sh +SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install yq and docker RUN apt-get update && \ @@ -18,6 +19,7 @@ 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 && \ sh get-docker.sh ARG IMG_USER=kata-builder