github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-16 22:39:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1418 from Amulyam24/fix-docker-ppc64le

Browse Source 
osbuiler: fixing USE_DOCKER for ppc64le
This commit is contained in:
Chelsea Mafrica
2021-03-19 17:22:12 -07:00
committed by GitHub
parent f26db684c8 5096103e7e
commit 8c1abc3b57
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/osbuilder/rootfs-builder/fedora/Dockerfile.in
View File

@@ -26,6 +26,7 @@ RUN dnf -y update && dnf install -y \
libseccomp-devel \ libseccomp-devel \
libstdc++-devel \ libstdc++-devel \
libstdc++-static \ libstdc++-static \
protobuf-compiler \
m4 \ m4 \
make \ make \
pkgconfig \ pkgconfig \

3
tools/osbuilder/scripts/lib.sh
View File

@@ -244,6 +244,7 @@ generate_dockerfile()
goarch=ppc64le goarch=ppc64le
rustarch=powerpc64le rustarch=powerpc64le
muslarch=powerpc64 muslarch=powerpc64
libc=gnu
;; ;;
"aarch64") "aarch64")
@@ -347,7 +348,7 @@ RUN ln -sf /usr/bin/g++ /bin/musl-g++
-e "s|@OS_VERSION@|${OS_VERSION:-}|g" \ -e "s|@OS_VERSION@|${OS_VERSION:-}|g" \
-e "s|@INSTALL_MUSL@||g" \ -e "s|@INSTALL_MUSL@||g" \
-e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \ -e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \
-e "s|@INSTALL_RUST@||g" \ -e "s|@INSTALL_RUST@|${install_rust//$'\n'/\\n}|g" \
-e "s|@SET_PROXY@|${set_proxy:-}|g" \ -e "s|@SET_PROXY@|${set_proxy:-}|g" \
"${dockerfile_template}" > Dockerfile "${dockerfile_template}" > Dockerfile
# no musl target on s390x, will use GNU # no musl target on s390x, will use GNU