If there's a PEP do not add the haproxy network.
This commit is contained in:
parent
0be2fa56e3
commit
0c85d7a90a
|
@ -7,7 +7,7 @@ shinyproxy_as_docker_service: false
|
||||||
shinyproxy_docker_privileged_user: true
|
shinyproxy_docker_privileged_user: true
|
||||||
shinyproxy_major_ver: 3
|
shinyproxy_major_ver: 3
|
||||||
shinyproxy_minor_ver: 1
|
shinyproxy_minor_ver: 1
|
||||||
shinyproxy_patch_ver: 0
|
shinyproxy_patch_ver: 1
|
||||||
shinyproxy_version: '{{ shinyproxy_major_ver }}.{{ shinyproxy_minor_ver }}.{{ shinyproxy_patch_ver }}'
|
shinyproxy_version: '{{ shinyproxy_major_ver }}.{{ shinyproxy_minor_ver }}.{{ shinyproxy_patch_ver }}'
|
||||||
shinyproxy_file_name: 'shinyproxy-{{ shinyproxy_version }}.jar'
|
shinyproxy_file_name: 'shinyproxy-{{ shinyproxy_version }}.jar'
|
||||||
shinyproxy_url: 'https://www.shinyproxy.io/downloads/{{ shinyproxy_file_name }}'
|
shinyproxy_url: 'https://www.shinyproxy.io/downloads/{{ shinyproxy_file_name }}'
|
||||||
|
@ -54,6 +54,7 @@ shinyproxy_as_docker_service_name: 'shinyproxy'
|
||||||
shinyproxy_as_docker_src_dir: /srv/{{ shinyproxy_as_docker_stack_name }}_service
|
shinyproxy_as_docker_src_dir: /srv/{{ shinyproxy_as_docker_stack_name }}_service
|
||||||
shinyproxy_docker_network: 'shinyproxy'
|
shinyproxy_docker_network: 'shinyproxy'
|
||||||
shinyproxy_docker_swarm_behind_haproxy: true
|
shinyproxy_docker_swarm_behind_haproxy: true
|
||||||
|
shinyproxy_docker_swarm_behind_pep: false
|
||||||
shinyproxy_docker_swarm_replicas: 1
|
shinyproxy_docker_swarm_replicas: 1
|
||||||
shinyproxy_docker_mount_conf_file: false
|
shinyproxy_docker_mount_conf_file: false
|
||||||
shinyproxy_docker_log_to_journal: true
|
shinyproxy_docker_log_to_journal: true
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
version: '3.8'
|
version: '3.8'
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
{% if not shinyproxy_docker_swarm_behind_pep %}
|
||||||
{% if shinyproxy_container_backend == 'docker-swarm' and shinyproxy_docker_swarm_behind_haproxy %}
|
{% if shinyproxy_container_backend == 'docker-swarm' and shinyproxy_docker_swarm_behind_haproxy %}
|
||||||
haproxy-public:
|
haproxy-public:
|
||||||
external: true
|
external: true
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ shinyproxy_docker_network }}:
|
{{ shinyproxy_docker_network }}:
|
||||||
|
|
||||||
|
@ -60,9 +62,11 @@ services:
|
||||||
{% endif %}
|
{% endif %}
|
||||||
networks:
|
networks:
|
||||||
- {{ shinyproxy_docker_network }}
|
- {{ shinyproxy_docker_network }}
|
||||||
|
{% if not shinyproxy_docker_swarm_behind_pep %}
|
||||||
{% if shinyproxy_container_backend == 'docker-swarm' and shinyproxy_docker_swarm_behind_haproxy %}
|
{% if shinyproxy_container_backend == 'docker-swarm' and shinyproxy_docker_swarm_behind_haproxy %}
|
||||||
- haproxy-public
|
- haproxy-public
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
{% if shinyproxy_container_backend == 'docker-swarm' %}
|
{% if shinyproxy_container_backend == 'docker-swarm' %}
|
||||||
deploy:
|
deploy:
|
||||||
mode: replicated
|
mode: replicated
|
||||||
|
|
Loading…
Reference in New Issue