projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arvados/jobs image uses python3 for arvados-cwl-runner
[arvados.git]
/
docker
/
jobs
/
Dockerfile
diff --git
a/docker/jobs/Dockerfile
b/docker/jobs/Dockerfile
index 079276e52c56cc9bda844b8db13607a16c86bd86..876ac4f9f49cea14c42f54f1ebe37423b4251cd2 100644
(file)
--- a/
docker/jobs/Dockerfile
+++ b/
docker/jobs/Dockerfile
@@
-4,7
+4,7
@@
# Based on Debian Stretch
FROM debian:stretch-slim
# Based on Debian Stretch
FROM debian:stretch-slim
-MAINTAINER
Ward Vandewege <wvandewege@veritasgenetics
.com>
+MAINTAINER
Peter Amstutz <peter.amstutz@curii
.com>
ENV DEBIAN_FRONTEND noninteractive
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 \
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
+ python
3
-arvados-cwl-runner=$cwl_runner_version
# use the Python executable from the python-arvados-cwl-runner package
# 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 \
# Install dependencies and set up system.
RUN /usr/sbin/adduser --disabled-password \