[ARVADOS] updated: 1.3.0-2109-g805883d45

Git user git at public.arvados.org
Mon Jan 27 23:06:25 UTC 2020


Summary of changes:
 docker/jobs/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

       via  805883d4570e13e2760fa371e1a7714db3d8a0c9 (commit)
      from  bc4f35573b38ccde0756209057c8bce6947a38bc (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 805883d4570e13e2760fa371e1a7714db3d8a0c9
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Jan 27 18:05:23 2020 -0500

    arvados/jobs image uses python3 for arvados-cwl-runner
    
    This avoids the deprecation warning from cwltool.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 079276e52..876ac4f9f 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -4,7 +4,7 @@
 
 # Based on Debian Stretch
 FROM debian:stretch-slim
-MAINTAINER Ward Vandewege <wvandewege at veritasgenetics.com>
+MAINTAINER Peter Amstutz <peter.amstutz at curii.com>
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -25,10 +25,11 @@ RUN echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_v
 RUN apt-get update -q
 RUN apt-get install -yq --no-install-recommends nodejs \
     python-arvados-python-client=$python_sdk_version \
-    python-arvados-cwl-runner=$cwl_runner_version
+    python3-arvados-cwl-runner=$cwl_runner_version
 
 # use the Python executable from the python-arvados-cwl-runner package
-RUN rm -f /usr/bin/python && ln -s /usr/share/python2.7/dist/python-arvados-cwl-runner/bin/python /usr/bin/python
+RUN rm -f /usr/bin/python && ln -s /usr/share/python2.7/dist/python-arvados-python-client/bin/python /usr/bin/python
+RUN rm -f /usr/bin/python3 && ln -s /usr/share/python3/dist/python3-arvados-cwl-runner/bin/python /usr/bin/python3
 
 # Install dependencies and set up system.
 RUN /usr/sbin/adduser --disabled-password \

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list