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

Fix the docker compose and shinyproxy conf syntax

This commit is contained in:
Andrea Dell'Amico 2020-10-06 19:49:13 +02:00
parent dfbe29656a
commit 1c41052e76
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,14 +37,14 @@ proxy:
container-memory-request: {{ shinyproxy_docker_memory_request }}
container-memory-limit: {{ shinyproxy_docker_memory_limit }}
container-cpu-limit: {{ shinyproxy_docker_cpu_limit }}
{% if not shinyproxy_as_docker_service %}
cert-path: {{ shinyproxy_docker_certs_dir }}
url: {{ shinyproxy_docker_url }}
container-protocol: {{ shinyproxy_docker_protocol }}
port-range-start: {{ shinyproxy_docker_port_range_start }}
{% if shinyproxy_as_docker_service %}
internal-networking: true
{% else %}
internal-networking: {{ shinyproxy_docker_internal_networking }}
{% else %}
internal-networking: true
{% endif %}
{% endif %}
specs:
@ -67,10 +67,14 @@ proxy:
container-image: {{ app.docker_image }}
container-memory: {{ app.docker_memory | default('2g') }}
{% if shinyproxy_as_docker_service %}
container-network: {{ shinyproxy_docker_network }}
{% endif %}
{% if app.groups is defined %}
groups: {{ app.groups }}
{% endif %}
{% endfor %}

2
templates/shinyproxy-docker-compose.yml.j2
View File

@ -28,6 +28,6 @@ services:
{% endif %}
networks:
'{{ shinyproxy_docker_network }}':
{{ shinyproxy_docker_network }}:
driver: overlay
attachable: true