Summary of changes:
build/run-build-docker-jobs-image.sh | 29 ++++++++++++++++++++++++-----
docker/jobs/apt.arvados.org.list | 1 -
2 files changed, 24 insertions(+), 6 deletions(-)
via 5fed5bf2c830b76db0aa7a2d7c787ae6941da53f (commit)
from 3131146af966744a8f19e56be2d4a870bc4ab615 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 5fed5bf2c830b76db0aa7a2d7c787ae6941da53f
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date: Mon Dec 3 16:29:24 2018 -0500
If a version tag is passed to run-build-docker-jobs-image.sh, actually use that
version of our codebase for the packages installed in the image.
run-build-docker-jobs-image.sh now also supports our ARVADOS_BUILDING_VERSION
and ARVADOS_BUILDING_ITERATION mechanism, so versions can be overridden that
way.
No issue #
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>
diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh
index b1e99fc66..fc1eb72c7 100755
--- a/build/run-build-docker-jobs-image.sh
+++ b/build/run-build-docker-jobs-image.sh
@@ -118,6 +118,11 @@ timer_reset
# clean up the docker build environment
cd "$WORKSPACE"
+if [[ -z "$ARVADOS_BUILDING_VERSION" ]] && ! [[ -z "$version_tag" ]]; then
+ ARVADOS_BUILDING_VERSION="$version_tag"
+ ARVADOS_BUILDING_ITERATION="1"
+fi
+
python_sdk_ts=$(cd sdk/python && timestamp_from_git)
cwl_runner_ts=$(cd sdk/cwl && timestamp_from_git)
@@ -130,11 +135,25 @@ fi
echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version
+if [[ "${python_sdk_version}" != "${ARVADOS_BUILDING_VERSION}" ]]; then
+ python_sdk_version="${python_sdk_version}-2"
+else
+ python_sdk_version="${ARVADOS_BUILDING_VERSION}-${ARVADOS_BUILDING_ITERATION}"
+fi
+
+cwl_runner_version_orig=$cwl_runner_version
+
+if [[ "${cwl_runner_version}" != "${ARVADOS_BUILDING_VERSION}" ]]; then
+ cwl_runner_version="${cwl_runner_version}-4"
+else
+ cwl_runner_version="${ARVADOS_BUILDING_VERSION}-${ARVADOS_BUILDING_ITERATION}"
+fi
+
cd docker/jobs
docker build $NOCACHE \
- --build-arg python_sdk_version=${python_sdk_version}-2 \
- --build-arg cwl_runner_version=${cwl_runner_version}-4 \
- -t arvados/jobs:$cwl_runner_version .
+ --build-arg python_sdk_version=${python_sdk_version} \
+ --build-arg cwl_runner_version=${cwl_runner_version} \
+ -t arvados/jobs:$cwl_runner_version_orig .
ECODE=$?
@@ -157,9 +176,9 @@ if docker --version |grep " 1\.[0-9]\." ; then
FORCE=-f
fi
if ! [[ -z "$version_tag" ]]; then
- docker tag $FORCE arvados/jobs:$cwl_runner_version arvados/jobs:"$version_tag"
+ docker tag $FORCE arvados/jobs:$cwl_runner_version_orig arvados/jobs:"$version_tag"
else
- docker tag $FORCE arvados/jobs:$cwl_runner_version arvados/jobs:latest
+ docker tag $FORCE arvados/jobs:$cwl_runner_version_orig arvados/jobs:latest
fi
ECODE=$?
diff --git a/docker/jobs/apt.arvados.org.list b/docker/jobs/apt.arvados.org.list
index ae1a0862a..11b98e25b 100644
--- a/docker/jobs/apt.arvados.org.list
+++ b/docker/jobs/apt.arvados.org.list
@@ -1,3 +1,2 @@
# apt.arvados.org
-deb http://apt.arvados.org/ jessie main
deb http://apt.arvados.org/ jessie-dev main
-----------------------------------------------------------------------
hooks/post-receive
--