From 12ea4f0ca4b20118ce0db0db9945b075df204f6c Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Sun, 4 Jun 2023 23:02:16 +0200 Subject: [PATCH] add strict port mapping back --- templates/docker-compose.yml.j2 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 244c5e0..28e1dba 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -28,17 +28,17 @@ services: condition: service_healthy {% endif %} ports: - - "53:53/tcp" - - "53:53/udp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}53:53/tcp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}53:53/udp" {% if deploy_adguard_enable_admin_interface %} - "{% if deploy_adguard_consul['enable'] %}127.0.0.1:{% endif %}80:80/tcp" - "{% if deploy_adguard_consul['enable'] %}127.0.0.1:{% endif %}443:443/tcp" - "3000:3000/tcp" {% endif %} {% if deploy_adguard_enable_dhcp %} - - "67:67/udp" - - "68:68/tcp" - - "68:68/udp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}67:67/udp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}68:68/tcp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}68:68/udp" {% endif %} {% if deploy_adguard_enable_doh %} - "{% if deploy_adguard_virtual_ip['enable'] %}{% endif %}443:443/udp" @@ -47,13 +47,13 @@ services: - "{% if deploy_adguard_virtual_ip['enable'] %}{% endif %}853:853/tcp" {% endif %} {% if deploy_adguard_enable_doq %} - - "784:784/udp" - - "8853:8853/udp" - - "853:853/udp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}784:784/udp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}8853:8853/udp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}853:853/udp" {% endif %} {% if deploy_adguard_enable_dnscrypt %} - - "5443:5443/tcp" - - "5443:5443/udp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}5443:5443/tcp" + - "{% if deploy_adguard_virtual_ip['enable'] %}{{ deploy_adguard_virtual_ip['vip_addr'] }}:{% endif %}5443:5443/udp" {% endif %} volumes: - conf:/opt/adguardhome/conf