From 4b96bd433a18b2ae94d20c7d6a521f41b916c17f Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 3 Jan 2026 11:09:44 -0600 Subject: [PATCH] refactor --- src/scripts/docker_common.sh | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/scripts/docker_common.sh b/src/scripts/docker_common.sh index 979380b..a16f5f2 100755 --- a/src/scripts/docker_common.sh +++ b/src/scripts/docker_common.sh @@ -19,30 +19,24 @@ if [ "${DOCKER_CREATE_ONLY}" != "1" ]; then docker rm ${DOCKER_CONTAINER} fi +if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then + PLATFORM_TYPE="linux/arm64" +else + PLATFORM_TYPE="linux/amd64" +fi + pushd "${PROJECT_SOURCE_DIR}/support" cp -f ${PROJECT_SOURCE_DIR}/docker/${PROJECT_BUILD_ARCH}/${DOCKER_NAME} Dockerfile -if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then - docker build ${APP_VERSION_BUILD_ARGS} \ - --platform linux/arm64 \ - --build-arg C_STANDARD=${PROJECT_C_STANDARD} \ - --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \ - --build-arg NUM_JOBS=${NUM_JOBS} \ - --build-arg UID=$(id -u) \ - --build-arg GID=$(id -g) \ - --build-arg USERNAME=$(id -un) \ - -t ${DOCKER_TAG} . || exit 1 -else - docker build ${APP_VERSION_BUILD_ARGS} \ - --platform linux/amd64 \ - --build-arg C_STANDARD=${PROJECT_C_STANDARD} \ - --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \ - --build-arg NUM_JOBS=${NUM_JOBS} \ - --build-arg UID=$(id -u) \ - --build-arg GID=$(id -g) \ - --build-arg USERNAME=$(id -un) \ - -t ${DOCKER_TAG} . || exit 1 -fi +docker build ${APP_VERSION_BUILD_ARGS} \ + --platform ${PLATFORM_TYPE} \ + --build-arg C_STANDARD=${PROJECT_C_STANDARD} \ + --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \ + --build-arg NUM_JOBS=${NUM_JOBS} \ + --build-arg UID=$(id -u) \ + --build-arg GID=$(id -g) \ + --build-arg USERNAME=$(id -un) \ + -t ${DOCKER_TAG} . || exit 1 rm Dockerfile popd