From bfab28379674fec860102c129f9248c62b32875e Mon Sep 17 00:00:00 2001 From: Yang Chiu Date: Wed, 30 Nov 2022 10:13:09 +0800 Subject: [PATCH] build: fix wrong dockerfile configuration for multi-platform Signed-off-by: Yang Chiu --- scripts/package | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/scripts/package b/scripts/package index 255c759e..c488a6dc 100755 --- a/scripts/package +++ b/scripts/package @@ -9,11 +9,22 @@ mkdir -p dist/artifacts cp bin/* dist/artifacts mv dist/artifacts/support-bundle-kit dist/artifacts/support-bundle-kit${SUFFIX} +case $(uname -m) in + aarch64 | arm64) + ARCH=arm64 + ;; + x86_64) + ARCH=amd64 + ;; + s390x) + ARCH=s390x + ;; + *) + echo "$(uname -a): unsupported architecture" + exit 1 +esac + IMAGE=${REPO}/support-bundle-kit:${TAG} -DOCKERFILE=Dockerfile -if [ -e ${DOCKERFILE}.${ARCH} ]; then - DOCKERFILE=${DOCKERFILE}.${ARCH} -fi -docker build -f package/${DOCKERFILE} -t ${IMAGE} . +docker build --build-arg ARCH=${ARCH} --no-cache -f package/Dockerfile -t ${IMAGE} . echo Built ${IMAGE}