projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12848-python-versions'
[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 1519e795a4dffe20a828528efe946d4b5d926e10..fb970affb4c4bbe94ef5a7281a2389732044aae9 100755
(executable)
--- a/
build/run-build-docker-jobs-image.sh
+++ b/
build/run-build-docker-jobs-image.sh
@@
-1,4
+1,7
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
function usage {
echo >&2
function usage {
echo >&2
@@
-118,23
+121,20
@@
cd "$WORKSPACE"
python_sdk_ts=$(cd sdk/python && timestamp_from_git)
cwl_runner_ts=$(cd sdk/cwl && timestamp_from_git)
python_sdk_ts=$(cd sdk/python && timestamp_from_git)
cwl_runner_ts=$(cd sdk/cwl && timestamp_from_git)
-python_sdk_version=$(cd sdk/python && nohash_version_from_git 0.1)
-2
-cwl_runner_version=$(cd sdk/cwl && nohash_version_from_git 1.0)
-3
+python_sdk_version=$(cd sdk/python && nohash_version_from_git 0.1)
+cwl_runner_version=$(cd sdk/cwl && nohash_version_from_git 1.0)
if [[ $python_sdk_ts -gt $cwl_runner_ts ]]; then
if [[ $python_sdk_ts -gt $cwl_runner_ts ]]; then
- cwl_runner_version=$(cd sdk/python && nohash_version_from_git 1.0)-3
- gittag=$(cd sdk/python && git log --first-parent --max-count=1 --format=format:%H)
-else
- gittag=$(cd sdk/cwl && git log --first-parent --max-count=1 --format=format:%H)
+ cwl_runner_version=$(cd sdk/python && nohash_version_from_git 1.0)
fi
echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version
cd docker/jobs
docker build $NOCACHE \
fi
echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version
cd docker/jobs
docker build $NOCACHE \
- --build-arg python_sdk_version=$
python_sdk_version
\
- --build-arg cwl_runner_version=$
cwl_runner_version
\
- -t arvados/jobs:$
gittag
.
+ --build-arg python_sdk_version=$
{python_sdk_version}-2
\
+ --build-arg cwl_runner_version=$
{cwl_runner_version}-3
\
+ -t arvados/jobs:$
cwl_runner_version
.
ECODE=$?
ECODE=$?
@@
-157,7
+157,7
@@
if docker --version |grep " 1\.[0-9]\." ; then
FORCE=-f
fi
FORCE=-f
fi
-docker tag $FORCE arvados/jobs:$
gittag
arvados/jobs:latest
+docker tag $FORCE arvados/jobs:$
cwl_runner_version
arvados/jobs:latest
ECODE=$?
ECODE=$?
@@
-180,7
+180,7
@@
else
## even though credentials are already in .dockercfg
docker login -u arvados
## even though credentials are already in .dockercfg
docker login -u arvados
- docker_push arvados/jobs:$
gittag
+ docker_push arvados/jobs:$
cwl_runner_version
docker_push arvados/jobs:latest
title "upload arvados images finished (`timer`)"
else
docker_push arvados/jobs:latest
title "upload arvados images finished (`timer`)"
else