From: Ward Vandewege <wvandewege@veritasgenetics.com>
Date: Thu, 7 Feb 2019 16:52:04 +0000 (-0500)
Subject: In the arvados/jobs image, use the Python executable from the
X-Git-Tag: 1.4.0~157
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/cdd31206b8c228ffcdc6f0ab7f0017d537836678

In the arvados/jobs image, use the Python executable from the
python-arvados-python-client package by default.

refs #9945

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>
---

diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 12c68564bd..c0fe145db1 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -23,6 +23,9 @@ RUN apt-get install -yq --no-install-recommends \
     python-arvados-python-client=$python_sdk_version \
     python-arvados-cwl-runner=$cwl_runner_version
 
+# use the Python executable from the python-arvados-python-client package
+RUN rm -f /usr/bin/python && ln -s /usr/share/python2.7/dist/python-arvados-python-client/bin/python /usr/bin/python
+
 # Install dependencies and set up system.
 RUN /usr/sbin/adduser --disabled-password \
       --gecos 'Crunch execution user' crunch && \