github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-13 21:56:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7849 from BbolroC/hot-fix-dockerbuild

Browse Source 
packaging: do not install docker-compose-plugin for s390x|ppc64le
This commit is contained in:
Hyounggyu Choi 2023-09-06 13:13:25 +02:00 committed by GitHub
commit d27fe18167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,8 @@ 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 && \ 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 sh get-docker.sh
ARG IMG_USER=kata-builder ARG IMG_USER=kata-builder