ISTI-ansible-roles
/
ansible-role-shinyproxy
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support the 'privileged' mode for containers.

This commit is contained in:
Andrea Dell'Amico 2022-04-06 19:07:07 +02:00
parent 2cfe882d19
commit ac7a5ae5f9
Signed by: adellam
GPG Key ID: 147ABE6CEB9E20FF
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -62,6 +62,7 @@ shinyproxy_docker_protocol: http
shinyproxy_docker_certs_dir: /etc/pki/shinyproxy shinyproxy_docker_certs_dir: /etc/pki/shinyproxy
shinyproxy_docker_url: '{{ shinyproxy_docker_protocol }}://{{ shinyproxy_docker_host }}:{{ shinyproxy_docker_port }}' shinyproxy_docker_url: '{{ shinyproxy_docker_protocol }}://{{ shinyproxy_docker_host }}:{{ shinyproxy_docker_port }}'
shinyproxy_docker_port_range_start: 20000 shinyproxy_docker_port_range_start: 20000
shinyproxy_docker_privileged: 'false'
shinyproxy_docker_cpu_limit: 1 shinyproxy_docker_cpu_limit: 1
shinyproxy_docker_memory_request: '1g' shinyproxy_docker_memory_request: '1g'
shinyproxy_docker_memory_limit: '2g' shinyproxy_docker_memory_limit: '2g'

9
templates/shinyproxy-2-conf.yml.j2
View File

@ -93,6 +93,7 @@ proxy:
cert-path: {{ shinyproxy_docker_certs_dir }} cert-path: {{ shinyproxy_docker_certs_dir }}
url: {{ shinyproxy_docker_url }} url: {{ shinyproxy_docker_url }}
container-protocol: {{ shinyproxy_docker_protocol }} container-protocol: {{ shinyproxy_docker_protocol }}
privileged: {{ shinyproxy_docker_privileged }}
port-range-start: {{ shinyproxy_docker_port_range_start }} port-range-start: {{ shinyproxy_docker_port_range_start }}
internal-networking: {{ shinyproxy_docker_internal_networking }} internal-networking: {{ shinyproxy_docker_internal_networking }}
{% else %} {% else %}
@ -118,7 +119,13 @@ proxy:
{% if app.cmd is defined %}container-cmd: ["R", "-e {{ app.cmd }}"]{% endif %} {% if app.cmd is defined %}container-cmd: ["R", "-e {{ app.cmd }}"]{% endif %}
container-image: {{ app.docker_image }} container-image: {{ app.docker_image }}
container-memory: {{ app.docker_memory | default('2g') }} container-privileged: {{ app.container_privileged | default('false') }}
container-memory-request: {{ app.container_memory_request | default('256m')}}
container-memory-limit: {{ app.docker_memory | default('2g') }}
container-cpu-request: {{ app.container_cpu_request | default('1') }}
{% if app.container_cpu_limit is defined %}container-cpu-limit: {{ app.container_cpu_limit }}{% endif %}
{% if shinyproxy_version is version_compare('2.6.0', '>=') %} {% if shinyproxy_version is version_compare('2.6.0', '>=') %}
stop-on-logout: {{ app.stop_on_logout | default('true') }} stop-on-logout: {{ app.stop_on_logout | default('true') }}