X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/18b6c49d69b8264273150cd29b2bf0b57c54e2a8..0c98c5c9c5902a94dc614736a46b43fd43faba6e:/build/run-build-docker-jobs-image.sh diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh index 7ec82c4401..d2c9f7274b 100755 --- a/build/run-build-docker-jobs-image.sh +++ b/build/run-build-docker-jobs-image.sh @@ -149,12 +149,13 @@ else python_sdk_version="${ARVADOS_BUILDING_VERSION}-${ARVADOS_BUILDING_ITERATION}" fi -# What we use to tag the Docker image. For release candidate -# packages, the OS package has a "~rc" suffix, but Python requires -# just an "rc" suffix. Arvados-cwl-runner will be expecting the -# Python-compatible version string when it tries to pull the Docker -# image, but --build-arg is expecting the OS package version. -cwl_runner_version_tag=$(echo -n $cwl_runner_version | sed s/~rc/rc/g) +# What we use to tag the Docker image. For development and release +# candidate packages, the OS package has a "~dev" or "~rc" suffix, but +# Python requires a ".dev" or "rc" suffix. Arvados-cwl-runner will be +# expecting the Python-compatible version string when it tries to pull +# the Docker image, but --build-arg is expecting the OS package +# version. +cwl_runner_version_tag=$(echo -n $cwl_runner_version | sed s/~dev/.dev/g | sed s/~rc/rc/g) if [[ "${cwl_runner_version}" != "${ARVADOS_BUILDING_VERSION}" ]]; then cwl_runner_version="${cwl_runner_version}-1"