BlockStorage/repertory
1
0
Fork 0
Code Issues 3 Pull Requests Releases 9 Wiki Activity

Merge branch 'v2.1.0-rc.2-develop' of ssh://git.fifthgrid.com:3022/BlockStorage/repertory into v2.1.0-rc.2-develop

Browse Source
This commit is contained in:
Scott E. Graves
2026-01-08 21:16:34 -06:00
parent 28ef84a69b 70cc850f10
commit d11cfc0a5e
5 changed files with 16 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/docker_common.sh
View File

@@ -19,29 +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} \
--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