diff --git a/defaults/main.yml b/defaults/main.yml index 99e1a54..6be9f3a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,6 +16,7 @@ shinyproxy_conf_dir: '{{ shinyproxy_install_dir }}' shinyproxy_log_dir: /var/log/shinyproxy shinyproxy_bind_address: 127.0.0.1 shinyproxy_http_port: 8080 +shinyproxy_docker_http_port_mode: 'host' shinyproxy_heartbeat_rate: 10000 shinyproxy_heartbeat_timeout: 60000 shinyproxy_undertow_loglevel: 'INFO' diff --git a/templates/shinyproxy-docker-compose.yml.j2 b/templates/shinyproxy-docker-compose.yml.j2 index 42fb67c..0c6bcd7 100644 --- a/templates/shinyproxy-docker-compose.yml.j2 +++ b/templates/shinyproxy-docker-compose.yml.j2 @@ -17,9 +17,15 @@ services: {% if shinyproxy_container_backend == 'docker' %} build: . ports: - - {{ shinyproxy_http_port }}:{{ shinyproxy_http_port }} + - target: {{ shinyproxy_http_port }} + published: :{{ shinyproxy_http_port }} + protocol: tcp + mode: '{{ shinyproxy_docker_http_port_mode }}' {% if shinyproxy_expose_prometheus and shinyproxy_version is version_compare('2.5.0', '>=') %} - - {{ shinyproxy_prometheus_port }}:9090 + - target: 9090 + published: {{ shinyproxy_prometheus_port }} + protocol: tcp + mode: 'host' {% endif %} {% else %} image: {{ shinyproxy_docker_image }}