From 3a8131349ebca23c7cb0f0b5a61144b961bf93ba Mon Sep 17 00:00:00 2001
From: Ruoqing He <heruoqing@iscas.ac.cn>
Date: Thu, 6 Mar 2025 11:45:08 +0800
Subject: [PATCH] kata-deploy: Use docker.io for all archietcutres
Switch to `docker.io` provided by Ubuntu sources. It is not necessary
for us to install docker through `get-docker.sh`.
Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
---
.../kata-deploy/local-build/dockerbuild/Dockerfile | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile b/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile
index 25ed2b8b53..eb617c89b3 100644
--- a/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile
+++ b/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile
@@ -18,6 +18,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
+ docker.io \
curl \
make \
git \
@@ -25,11 +26,7 @@ RUN apt-get update && \
sudo && \
apt-get clean && rm -rf /var/lib/apt/lists/ && \
install_yq.sh && \
- install_oras.sh && \
- curl -fsSL https://get.docker.com -o get-docker.sh && \
- if uname -m | grep -Eq 's390x|ppc64le'; then export VERSION="v20.10" && \
- sed -i 's/\<docker-compose-plugin\>//g' get-docker.sh; fi && \
- sh get-docker.sh
+ install_oras.sh
ARG IMG_USER=kata-builder
ARG UID=1000