Fix the docker compose and shinyproxy conf syntax
This commit is contained in:
parent
dfbe29656a
commit
1c41052e76
|
@ -37,14 +37,14 @@ proxy:
|
||||||
container-memory-request: {{ shinyproxy_docker_memory_request }}
|
container-memory-request: {{ shinyproxy_docker_memory_request }}
|
||||||
container-memory-limit: {{ shinyproxy_docker_memory_limit }}
|
container-memory-limit: {{ shinyproxy_docker_memory_limit }}
|
||||||
container-cpu-limit: {{ shinyproxy_docker_cpu_limit }}
|
container-cpu-limit: {{ shinyproxy_docker_cpu_limit }}
|
||||||
|
{% if not shinyproxy_as_docker_service %}
|
||||||
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 }}
|
||||||
port-range-start: {{ shinyproxy_docker_port_range_start }}
|
port-range-start: {{ shinyproxy_docker_port_range_start }}
|
||||||
{% if shinyproxy_as_docker_service %}
|
|
||||||
internal-networking: true
|
|
||||||
{% else %}
|
|
||||||
internal-networking: {{ shinyproxy_docker_internal_networking }}
|
internal-networking: {{ shinyproxy_docker_internal_networking }}
|
||||||
|
{% else %}
|
||||||
|
internal-networking: true
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
specs:
|
specs:
|
||||||
|
@ -67,10 +67,14 @@ proxy:
|
||||||
container-image: {{ app.docker_image }}
|
container-image: {{ app.docker_image }}
|
||||||
container-memory: {{ app.docker_memory | default('2g') }}
|
container-memory: {{ app.docker_memory | default('2g') }}
|
||||||
{% if shinyproxy_as_docker_service %}
|
{% if shinyproxy_as_docker_service %}
|
||||||
|
|
||||||
container-network: {{ shinyproxy_docker_network }}
|
container-network: {{ shinyproxy_docker_network }}
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if app.groups is defined %}
|
{% if app.groups is defined %}
|
||||||
|
|
||||||
groups: {{ app.groups }}
|
groups: {{ app.groups }}
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
|
@ -28,6 +28,6 @@ services:
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
'{{ shinyproxy_docker_network }}':
|
{{ shinyproxy_docker_network }}:
|
||||||
driver: overlay
|
driver: overlay
|
||||||
attachable: true
|
attachable: true
|
||||||
|
|
Loading…
Reference in New Issue