Skip to content

Fix build platform environment variable #13914

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

Merged
merged 3 commits into from
Feb 7, 2023
Merged

Fix build platform environment variable #13914

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05ad8d8
Fix build platform environment variable
Liam-Sturge Feb 3, 2023
74cd0ea
Merge branch 'apache:main' into fix_build_platform_env_variable
Liam-Sturge Feb 6, 2023
598d656
Merge branch 'apache:main' into fix_build_platform_env_variable
Liam-Sturge Feb 6, 2023
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
13 changes: 13 additions & 0 deletions docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,15 @@
# [--net=host] [--cache-from <IMAGE_NAME>] [--cache]
# [--name CONTAINER_NAME] [--context-path <CONTEXT_PATH>]
# [--spec DOCKER_IMAGE_SPEC]
# [--platform <BUILD_PLATFORM>]
# [<COMMAND>]
#
# CONTAINER_TYPE: Type of the docker container used the run the build,
# e.g. "ci_cpu", "ci_gpu"
#
# BUILD_PLATFORM: (Optional) Type of build platform used for the build,
# e.g. "arm", "cpu", "gpu". Defaults to "cpu".
#
# DOCKER_IMAGE_TAG: (Optional) Docker image tag to be built and used.
# Defaults to 'latest', as it is the default Docker tag.
#
Expand Down Expand Up @@ -119,6 +123,14 @@ if [[ "$1" == "--name" ]]; then
shift 2
fi

PLATFORM="cpu"

if [[ "$1" == "--platform" ]]; then
PLATFORM="$2"
echo "Using build platform: ${PLATFORM}"
shift 2
fi

if [[ ! -f "${DOCKERFILE_PATH}" ]]; then
echo "Invalid Dockerfile path: \"${DOCKERFILE_PATH}\""
exit 1
Expand Down Expand Up @@ -227,6 +239,7 @@ if [[ -n ${COMMAND} ]]; then
-e "CI_BUILD_GID=$(id -g)" \
-e "CI_PYTEST_ADD_OPTIONS=$CI_PYTEST_ADD_OPTIONS" \
-e "CI_IMAGE_NAME=${DOCKER_IMAGE_NAME}" \
-e "PLATFORM=${PLATFORM}" \
${CUDA_ENV}\
${CI_DOCKER_EXTRA_PARAMS[@]} \
${DOCKER_IMG_SPEC} \
Expand Down