bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject bigtop git commit: BIGTOP-3043: Hide workaround for docker defect on aarch64 in build.sh
Date Fri, 08 Jun 2018 19:34:24 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master 980e1883a -> 75cd3d915


BIGTOP-3043: Hide workaround for docker defect on aarch64 in build.sh


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/75cd3d91
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/75cd3d91
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/75cd3d91

Branch: refs/heads/master
Commit: 75cd3d915cf45d4a39a33a6d49a30564bdbee887
Parents: 980e188
Author: Olaf Flebbe <of@oflebbe.de>
Authored: Fri Jun 8 21:33:19 2018 +0200
Committer: Olaf Flebbe <of@oflebbe.de>
Committed: Fri Jun 8 21:33:19 2018 +0200

----------------------------------------------------------------------
 docker/bigtop-slaves/build.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/75cd3d91/docker/bigtop-slaves/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/build.sh b/docker/bigtop-slaves/build.sh
index 0b07c6a..3001206 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


Mime
View raw message