diff --git a/templates/shinyproxy-2-conf.yml.j2 b/templates/shinyproxy-2-conf.yml.j2 index 0a8a8bd..ae3420d 100644 --- a/templates/shinyproxy-2-conf.yml.j2 +++ b/templates/shinyproxy-2-conf.yml.j2 @@ -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 %} diff --git a/templates/shinyproxy-docker-compose.yml.j2 b/templates/shinyproxy-docker-compose.yml.j2 index 5087680..ea56191 100644 --- a/templates/shinyproxy-docker-compose.yml.j2 +++ b/templates/shinyproxy-docker-compose.yml.j2 @@ -28,6 +28,6 @@ services: {% endif %} networks: - '{{ shinyproxy_docker_network }}': + {{ shinyproxy_docker_network }}: driver: overlay attachable: true