This is an automated email from the ASF dual-hosted git repository.
evansye pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 0259005 BIGTOP-3203. [Sandbox] Architecture string is a mess for
Distributions (#515)
0259005 is described below
commit 0259005384ed1951ded6c140b1e3cf4d088344df
Author: Evans Ye <[email protected]>
AuthorDate: Sun Mar 31 02:18:29 2019 +0800
BIGTOP-3203. [Sandbox] Architecture string is a mess for Distributions
(#515)
---
docker/sandbox/build.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/docker/sandbox/build.sh b/docker/sandbox/build.sh
index 3baa87d..2a5179d 100755
--- a/docker/sandbox/build.sh
+++ b/docker/sandbox/build.sh
@@ -65,8 +65,7 @@ generate_tag() {
detect_repo() {
OS_SEP_BY_SLASH=${OS/-//}
- ARCH=$(docker run --rm bigtop/puppet:${PREFIX}-${OS}${ARCH_SUFFIX} facter
architecture)
-
REPO=${REPO:-"http://repos.bigtop.apache.org/releases/${PREFIX}/${OS_SEP_BY_SLASH}/$ARCH"}
+
REPO=${REPO:-"http://repos.bigtop.apache.org/releases/${PREFIX}/${OS_SEP_BY_SLASH}/$ARCH_FOR_PKG"}
}
image_config_validator() {
@@ -177,7 +176,10 @@ while [ $# -gt 0 ]; do
fi
OS=$2
running_arch=$(uname -m)
- if [ "x86_64" != ${running_arch} ]; then
+ if [ "x86_64" == "${running_arch}" ]; then
+ ARCH_FOR_PKG="amd64"
+ else
+ ARCH_FOR_PKG="arm64"
ARCH_SUFFIX="-${running_arch}"
fi
shift 2;;
