Skip to content

BIGTOP-4523. Make container tagging consistent between Linux and Mac OS on ARM #1384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iwasakims wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −6
Open

BIGTOP-4523. Make container tagging consistent between Linux and Mac OS on ARM #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions docker/bigtop-puppet/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ PREFIX=$(echo "$1" | cut -d '-' -f 1)
OS=$(echo "$1" | cut -d '-' -f 2)
VERSION=$(echo "$1" | cut -d '-' -f 3-)
ARCH=$(uname -m)
if [ "${ARCH}" != "x86_64" ];then
ARCH="-${ARCH}"
else
ARCH=""
fi
case "$ARCH" in
aarch64|arm64) ARCH="aarch64" ;;
*) ARCH="$ARCH" ;;
esac

ENV_PATH=""
if [ ${OS} = "centos" -a ${VERSION} -ge 8 ]; then
Expand Down Expand Up @@ -67,5 +66,8 @@ case "${OS}-${VERSION}" in
;;
esac

docker build --no-cache -t bigtop/puppet:${PREFIX}-${OS}-${VERSION}${ARCH} .
if [ "${ARCH}" != "x86_64" ];then
VERSION="${VERSION}-${ARCH}"
fi
docker build --no-cache -t bigtop/puppet:${PREFIX}-${OS}-${VERSION} .
rm -f Dockerfile puppetize.sh
4 changes: 4 additions & 0 deletions docker/bigtop-slaves/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ PREFIX=$(echo "$1" | cut -d '-' -f 1)
OS=$(echo "$1" | cut -d '-' -f 2)
VERSION=$(echo "$1" | cut -d '-' -f 3-)
ARCH=$(uname -m)
case "$ARCH" in
aarch64|arm64) ARCH="aarch64" ;;
*) ARCH="$ARCH" ;;
esac

## Workaround for docker defect on linaros cloud
if [ "${ARCH}" = "aarch64" ];then
Expand Down