github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-01 15:57:20 +00:00
Code Issues Projects Releases Wiki Activity

CI: Set docker version to v20.10 in ubuntu:20.04 for s390x|ppc64le

Browse Source 
This is to make a docker version to v20.10 in docker upstream image ubuntu:20.04 for s390x and ppc64le.

Fixes: #6211 for stable-3.0
Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
(cherry picked from commit f49b89b632)
Signed-off-by: Greg Kurz <groug@kaod.org>
This commit is contained in:
Hyounggyu Choi 2023-02-03 11:11:42 +01:00 committed by Greg Kurz
parent f90e75e542
commit 5883dc1bd9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile
View File

@ -8,6 +8,7 @@ ENV INSTALL_IN_GOPATH=false
COPY install_yq.sh /usr/bin/install_yq.sh COPY install_yq.sh /usr/bin/install_yq.sh
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Install yq and docker # Install yq and docker
RUN apt-get update && \ RUN apt-get update && \
@ -18,6 +19,7 @@ RUN apt-get update && \
apt-get clean && rm -rf /var/lib/apt/lists/ && \ apt-get clean && rm -rf /var/lib/apt/lists/ && \
install_yq.sh && \ install_yq.sh && \
curl -fsSL https://get.docker.com -o get-docker.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 sh get-docker.sh
ARG IMG_USER=kata-builder ARG IMG_USER=kata-builder