X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1416b0952adc0bfee85e15d9c86a51c32fcfd003..2e74236fa27822addd856f194befc28382990ce0:/sdk/dev-jobs.dockerfile diff --git a/sdk/dev-jobs.dockerfile b/sdk/dev-jobs.dockerfile index aa1f18052f..b55b056b2d 100644 --- a/sdk/dev-jobs.dockerfile +++ b/sdk/dev-jobs.dockerfile @@ -13,14 +13,17 @@ # (This dockerfile file must be located in the arvados/sdk/ directory because # of the docker build root.) -FROM debian:jessie -MAINTAINER Ward Vandewege +FROM debian:buster-slim +MAINTAINER Arvados Package Maintainers 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=python3 +ARG pipcmd=pip3 -RUN pip install -U setuptools six +RUN apt-get update -q && apt-get install -qy --no-install-recommends \ + git ${pythoncmd}-pip ${pythoncmd}-virtualenv ${pythoncmd}-dev libcurl4-gnutls-dev \ + libgnutls28-dev nodejs ${pythoncmd}-pyasn1-modules build-essential ${pythoncmd}-setuptools ARG sdk ARG runner @@ -32,10 +35,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-* && $pipcmd install . +RUN if test -d /tmp/schema-salad-* ; then cd /tmp/schema-salad-* && $pipcmd install . ; fi +RUN if test -d /tmp/cwltool-* ; then cd /tmp/cwltool-* && $pipcmd install . ; fi +RUN cd /tmp/arvados-cwl-runner-* && $pipcmd install . # Install dependencies and set up system. RUN /usr/sbin/adduser --disabled-password \