X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/10c1e7359286edd6562c52304e9706449a9ee53f..db09e5f787a1b2d0e02abb627bf25054a047f7db:/sdk/dev-jobs.dockerfile diff --git a/sdk/dev-jobs.dockerfile b/sdk/dev-jobs.dockerfile index aa1f18052f..ba1cbfec18 100644 --- a/sdk/dev-jobs.dockerfile +++ b/sdk/dev-jobs.dockerfile @@ -18,9 +18,11 @@ MAINTAINER Ward Vandewege ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -q && apt-get install -qy git python-pip python-virtualenv python-dev libcurl4-gnutls-dev libgnutls28-dev nodejs python-pyasn1-modules +ARG pythoncmd=python -RUN pip install -U setuptools six +RUN echo $pythoncmd +RUN apt-get update -q && apt-get install -qy git ${pythoncmd}-pip python-virtualenv ${pythoncmd}-dev libcurl4-gnutls-dev libgnutls28-dev nodejs python-pyasn1-modules +RUN if [ "$pythoncmd" = "python3" ]; then pip3 install -U setuptools six requests; else pip install -U setuptools six requests; fi ARG sdk ARG runner @@ -32,10 +34,10 @@ ADD cwl/salad_dist/$salad /tmp/ ADD cwl/cwltool_dist/$cwltool /tmp/ ADD cwl/dist/$runner /tmp/ -RUN cd /tmp/arvados-python-client-* && python setup.py install -RUN if test -d /tmp/schema-salad-* ; then cd /tmp/schema-salad-* && python setup.py install ; fi -RUN if test -d /tmp/cwltool-* ; then cd /tmp/cwltool-* && python setup.py install ; fi -RUN cd /tmp/arvados-cwl-runner-* && python setup.py install +RUN cd /tmp/arvados-python-client-* && $pythoncmd setup.py install +RUN if test -d /tmp/schema-salad-* ; then cd /tmp/schema-salad-* && $pythoncmd setup.py install ; fi +RUN if test -d /tmp/cwltool-* ; then cd /tmp/cwltool-* && $pythoncmd setup.py install ; fi +RUN cd /tmp/arvados-cwl-runner-* && $pythoncmd setup.py install # Install dependencies and set up system. RUN /usr/sbin/adduser --disabled-password \