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

osbuiler: fixing USE_DOCKER for ppc64le
This commit is contained in:
Chelsea Mafrica
2021-03-19 17:22:12 -07:00
committed by GitHub
2 changed files with 3 additions and 1 deletions

View File

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