Add volume mapping for Docker credentials (#4791)

apache · Jan 16, 2020 · 2fee285 · 2fee285
1 parent a72041e
commit 2fee285
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
@@ -199,6 +199,7 @@ invoker:
   docker:
     become: "{{ invoker_docker_become | default(false) }}"
     runcdir: "{{ invoker_runcdir | default('/run/docker/runtime-runc/moby') }}"
+    volumes: "{{ invoker_docker_volumes | default([]) }}"
   loglevel: "{{ invoker_loglevel | default(whisk_loglevel) | default('INFO') }}"
   jmxremote:
     jvmArgs: "{% if inventory_hostname in groups['invokers'] %}

diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
@@ -346,6 +346,11 @@
     volumes: "{{ volumes|default('') }},{{ coverage_logs_dir }}/invoker:/coverage"
   when: coverage_enabled
 
+- name: set invoker docker volumes
+  set_fact:
+    volumes: "{{ volumes|default('') }},{{ invoker.docker.volumes | join(',') }}"
+  when: invoker.docker.volumes|length > 0
+
 - name: start invoker
   docker_container:
     userns_mode: "host"