Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not link the /run/runc volume unless invoker_use_runc is set #4149

Merged
merged 2 commits into from
Dec 7, 2018
Merged

Do not link the /run/runc volume unless invoker_use_runc is set #4149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f12f84a
Do not link the `/run/runc` volume unless invoker_use_runc is set
akrabat Nov 30, 2018
c907c5b
Use invoker.useRunc
akrabat Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion ansible/roles/invoker/tasks/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,17 @@

- name: set invoker volumes
set_fact:
volumes: "/sys/fs/cgroup:/sys/fs/cgroup,/run/runc:/run/runc,\
volumes: "/sys/fs/cgroup:/sys/fs/cgroup,\
{{ whisk_logs_dir }}/{{ invoker_name }}:/logs,\
{{ invoker.confdir }}/{{ invoker_name }}:/conf,\
{{ dockerInfo['DockerRootDir'] }}/containers/:/containers,\
{{ docker_sock | default('/var/run/docker.sock') }}:/var/run/docker.sock"

- name: set invoker runc volume
set_fact:
volumes: "{{ volumes }},/run/runc:/run/runc"
when: invoker.useRunc == true

- name: define options when deploying invoker on Ubuntu
set_fact:
volumes: "{{ volumes|default('') }},/usr/lib/x86_64-linux-gnu/libapparmor.so.1:/usr/lib/x86_64-linux-gnu/libapparmor.so.1"
Expand Down