diff options
| author | Olaf Flebbe <of@oflebbe.de> | 2018-06-08 21:33:19 +0200 |
|---|---|---|
| committer | Olaf Flebbe <of@oflebbe.de> | 2018-06-08 21:33:19 +0200 |
| commit | 75cd3d915cf45d4a39a33a6d49a30564bdbee887 (patch) | |
| tree | 1cabe9a58406eda7a84dbbfcf1dbd16c8247c6c1 | |
| parent | 980e1883a66256b904cdcd11419f5745880ec55a (diff) | |
BIGTOP-3043: Hide workaround for docker defect on aarch64 in build.sh
| -rwxr-xr-x | docker/bigtop-slaves/build.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/bigtop-slaves/build.sh b/docker/bigtop-slaves/build.sh index 0b07c6a2..30012062 100755 --- a/docker/bigtop-slaves/build.sh +++ b/docker/bigtop-slaves/build.sh @@ -31,7 +31,11 @@ OS=$(echo "$1" | cut -d '-' -f 2) VERSION=$(echo "$1" | cut -d '-' -f 3) ARCH=$(uname -m) if [ "${ARCH}" != "x86_64" ];then -VERSION="${VERSION}-${ARCH}" + VERSION="${VERSION}-${ARCH}" +fi +## Workaround for docker defect on linaros cloud +if [ "${ARCH}" == "aarch64" ];then + NETWORK="--network=host" fi # setup puppet/modules path and update cmds @@ -65,5 +69,5 @@ esac sed -e "s|PREFIX|${PREFIX}|;s|OS|${OS}|;s|VERSION|${VERSION}|" Dockerfile.template | \ sed -e "s|PUPPET_MODULES|${PUPPET_MODULES}|;s|UPDATE_SOURCE|${UPDATE_SOURCE}|" > Dockerfile -docker build --rm -t bigtop/slaves:${PREFIX}-${OS}-${VERSION} -f Dockerfile ../.. +docker build ${NETWORK} --rm -t bigtop/slaves:${PREFIX}-${OS}-${VERSION} -f Dockerfile ../.. rm -f Dockerfile |