Merge branch '8333-docker-repo-tag'

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

diff --git a/sdk/dev-jobs.dockerfile b/sdk/dev-jobs.dockerfile
index 38fefd0c4df3d0519f6834749842793ce539d8b8..f9f1e967b94f7e589a60888261eae4a7916a88c1 100644 (file)
--- a/sdk/dev-jobs.dockerfile
+++ b/sdk/dev-jobs.dockerfile
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 # Dockerfile for building an arvados/jobs Docker image from local git tree.
 #
 # Intended for use by developers working on arvados-python-client or
@@ -20,13 +24,16 @@ RUN pip install -U setuptools
 
 ARG sdk
 ARG runner
+ARG salad
 ARG cwltool
 
 ADD python/dist/$sdk /tmp/
+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