Merge pull request #6217 from stevenhorsman/cherry-pick-docker-fix

CI: Set docker version to v20.10 in ubuntu:20.04 for s390x|ppc64le
This commit is contained in:
Fabiano Fidêncio 2023-02-07 13:38:23 +01:00 committed by GitHub
commit 84d6b3dea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,17 +8,19 @@ 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 && \
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
sudo && \
apt-get clean && rm -rf /var/lib/apt/lists/ && \
install_yq.sh && \
curl -fsSL https://get.docker.com -o get-docker.sh && \
sh get-docker.sh
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
sudo && \
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
ARG UID=1000