X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/32030bce1b67218c91a8ed2a0287ec973221c5f7..d0713d7531b41a29265e921d12cbb9542116ba1a:/sdk/dev-jobs.dockerfile diff --git a/sdk/dev-jobs.dockerfile b/sdk/dev-jobs.dockerfile index b55b056b2d..95b039eba9 100644 --- a/sdk/dev-jobs.dockerfile +++ b/sdk/dev-jobs.dockerfile @@ -28,18 +28,27 @@ RUN apt-get update -q && apt-get install -qy --no-install-recommends \ ARG sdk ARG runner ARG salad +ARG cwlutils ARG cwltool ADD python/dist/$sdk /tmp/ ADD cwl/salad_dist/$salad /tmp/ ADD cwl/cwltool_dist/$cwltool /tmp/ +ADD cwl/cwlutils_dist/$cwlutils /tmp/ ADD cwl/dist/$runner /tmp/ +RUN $pipcmd install wheel 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/cwl-utils-* ; then cd /tmp/cwl-utils-* && $pipcmd install . ; fi RUN if test -d /tmp/cwltool-* ; then cd /tmp/cwltool-* && $pipcmd install . ; fi RUN cd /tmp/arvados-cwl-runner-* && $pipcmd install . +# Sometimes Python dependencies install successfully but don't +# actually work. So run arvados-cwl-runner here to catch fun +# dependency errors like pkg_resources.DistributionNotFound. +RUN arvados-cwl-runner --version + # Install dependencies and set up system. RUN /usr/sbin/adduser --disabled-password \ --gecos 'Crunch execution user' crunch && \