Merge branch 'master' into 3198-writable-fuse

[arvados.git] / services / api / config / application.default.yml

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index e5c00c5ab76b37ff3fea654bd2235954fcc1b5ef..d46c3978a641187924bcc22da8f3a06d7bf1996a 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -311,3 +311,6 @@ common:
   # won't be strictly enforced until those nodes with higher slot numbers
   # go down.
   max_compute_nodes: 64
+
+  # Docker image to be used when none found in runtime_constraints of a job
+  default_docker_image_for_jobs: false