projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14345-add-webdav-user-doc
[arvados.git]
/
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 bac3276520d7fc250acdd54f54ccce5b5257a48a..b1e99fc66b27c40d3ac13542e6f7de76ba37e202 100755
(executable)
--- a/
build/run-build-docker-jobs-image.sh
+++ b/
build/run-build-docker-jobs-image.sh
@@
-133,7
+133,7
@@
echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_versi
cd docker/jobs
docker build $NOCACHE \
--build-arg python_sdk_version=${python_sdk_version}-2 \
cd docker/jobs
docker build $NOCACHE \
--build-arg python_sdk_version=${python_sdk_version}-2 \
- --build-arg cwl_runner_version=${cwl_runner_version}-
3
\
+ --build-arg cwl_runner_version=${cwl_runner_version}-
4
\
-t arvados/jobs:$cwl_runner_version .
ECODE=$?
-t arvados/jobs:$cwl_runner_version .
ECODE=$?
@@
-158,7
+158,7
@@
if docker --version |grep " 1\.[0-9]\." ; then
fi
if ! [[ -z "$version_tag" ]]; then
docker tag $FORCE arvados/jobs:$cwl_runner_version arvados/jobs:"$version_tag"
fi
if ! [[ -z "$version_tag" ]]; then
docker tag $FORCE arvados/jobs:$cwl_runner_version arvados/jobs:"$version_tag"
-else
+else
docker tag $FORCE arvados/jobs:$cwl_runner_version arvados/jobs:latest
fi
docker tag $FORCE arvados/jobs:$cwl_runner_version arvados/jobs:latest
fi