You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by st...@apache.org on 2020/01/16 02:25:25 UTC
[openwhisk] branch master updated: Add volume mapping for Docker
credentials (#4791)
This is an automated email from the ASF dual-hosted git repository.
style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 2fee285 Add volume mapping for Docker credentials (#4791)
2fee285 is described below
commit 2fee2858598860e0c964103b4ffce8e5cc2f3045
Author: Dominic Kim <do...@navercorp.com>
AuthorDate: Thu Jan 16 11:25:13 2020 +0900
Add volume mapping for Docker credentials (#4791)
---
ansible/group_vars/all | 1 +
ansible/roles/invoker/tasks/deploy.yml | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index a16a368..5e6d1b4 100644
--- 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
index 789fb1a..596a202 100644
--- 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"