refactor

src/scripts/docker_common.sh

@@ -19,12 +19,17 @@ 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 \
+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} \
@@ -32,17 +37,6 @@ if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
   --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
 rm Dockerfile
 popd