shinyproxy: connect to the haproxy-public network from the compose file
This commit is contained in:
parent
c209878c09
commit
27aea17ad6
|
@ -44,12 +44,6 @@
|
||||||
compose:
|
compose:
|
||||||
- '{{ shinyproxy_as_docker_src_dir }}/docker-shinyproxy-stack.yml'
|
- '{{ shinyproxy_as_docker_src_dir }}/docker-shinyproxy-stack.yml'
|
||||||
|
|
||||||
- name: Connect the shinyproxy serivce to the haproxy-public network
|
|
||||||
command: docker service update --network-add haproxy-public {{ shinyproxy_as_docker_service_name }}_{{ shinyproxy_as_docker_service_name }} --update-delay 30s --update-parallelism 1
|
|
||||||
run_once: True
|
|
||||||
ignore_errors: True
|
|
||||||
|
|
||||||
run_once: True
|
|
||||||
when:
|
when:
|
||||||
- docker_swarm_manager_main_node is defined and docker_swarm_manager_main_node | bool
|
- docker_swarm_manager_main_node is defined and docker_swarm_manager_main_node | bool
|
||||||
- shinyproxy_container_backend == 'docker-swarm'
|
- shinyproxy_container_backend == 'docker-swarm'
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
version: '3.6'
|
version: '3.2'
|
||||||
|
|
||||||
|
networks:
|
||||||
|
{% if shinyproxy_container_backend == 'docker-swarm' %}
|
||||||
|
haproxy-public:
|
||||||
|
external: true
|
||||||
|
{% endif %}
|
||||||
|
{{ shinyproxy_docker_network }}:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
shinyproxy:
|
shinyproxy:
|
||||||
|
@ -14,6 +21,9 @@ services:
|
||||||
- {{ shinyproxy_as_docker_src_dir }}/application.yml:/opt/shinyproxy/application.yml:ro
|
- {{ shinyproxy_as_docker_src_dir }}/application.yml:/opt/shinyproxy/application.yml:ro
|
||||||
networks:
|
networks:
|
||||||
- {{ shinyproxy_docker_network }}
|
- {{ shinyproxy_docker_network }}
|
||||||
|
{% if shinyproxy_container_backend == 'docker-swarm' %}
|
||||||
|
- haproxy-public
|
||||||
|
{% endif %}
|
||||||
{% if shinyproxy_container_backend == 'docker-swarm' %}
|
{% if shinyproxy_container_backend == 'docker-swarm' %}
|
||||||
deploy:
|
deploy:
|
||||||
mode: replicated
|
mode: replicated
|
||||||
|
@ -32,5 +42,3 @@ services:
|
||||||
driver: 'journald'
|
driver: 'journald'
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
networks:
|
|
||||||
{{ shinyproxy_docker_network }}:
|
|
||||||
|
|
Loading…
Reference in New Issue