Merge branch 'main' into 18842-arv-mount-disk-config

[arvados.git] / sdk / dev-jobs.dockerfile

diff --git a/sdk/dev-jobs.dockerfile b/sdk/dev-jobs.dockerfile
index b55b056b2d38339fe4bb42ddd15ba267099975ea..60db4a889815c1f66e9c1070b35b1077fc5b1d8b 100644 (file)
--- a/sdk/dev-jobs.dockerfile
+++ b/sdk/dev-jobs.dockerfile
@@ -35,11 +35,17 @@ ADD cwl/salad_dist/$salad /tmp/
 ADD cwl/cwltool_dist/$cwltool /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/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 && \