From: Peter Amstutz Date: Mon, 27 Jan 2020 23:05:23 +0000 (-0500) Subject: arvados/jobs image uses python3 for arvados-cwl-runner X-Git-Tag: 2.0.0~27 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/805883d4570e13e2760fa371e1a7714db3d8a0c9 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 --- diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile index 079276e52c..876ac4f9f4 100644 --- a/docker/jobs/Dockerfile +++ b/docker/jobs/Dockerfile @@ -4,7 +4,7 @@ # Based on Debian Stretch FROM debian:stretch-slim -MAINTAINER Ward Vandewege +MAINTAINER Peter Amstutz 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 \