From 161e6446cd68e95c53e909b7dda3a9629bb211b4 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Fri, 24 Jan 2025 07:28:12 +0100 Subject: [PATCH] fix(compose): made port expose optional Signed-off-by: Tuan-Dat Tran --- roles/docker_host/files/sysctl.conf | 1 + roles/docker_host/tasks/directory_setup.yml | 2 +- roles/docker_host/templates/compose.yaml.j2 | 2 +- roles/reverse_proxy/templates/Caddyfile.j2 | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 roles/docker_host/files/sysctl.conf diff --git a/roles/docker_host/files/sysctl.conf b/roles/docker_host/files/sysctl.conf new file mode 100644 index 0000000..16dace0 --- /dev/null +++ b/roles/docker_host/files/sysctl.conf @@ -0,0 +1 @@ +vm.max_map_count = 262144 diff --git a/roles/docker_host/tasks/directory_setup.yml b/roles/docker_host/tasks/directory_setup.yml index 52bc1a1..776f2f8 100644 --- a/roles/docker_host/tasks/directory_setup.yml +++ b/roles/docker_host/tasks/directory_setup.yml @@ -30,7 +30,7 @@ path: "{{ item }}" src: "192.168.20.12:{{ item }}" fstype: nfs - opts: defaults,nolock + opts: defaults,nolock,_netdev,auto,bg state: mounted loop: - /media/docker diff --git a/roles/docker_host/templates/compose.yaml.j2 b/roles/docker_host/templates/compose.yaml.j2 index 2801a61..c86fb34 100644 --- a/roles/docker_host/templates/compose.yaml.j2 +++ b/roles/docker_host/templates/compose.yaml.j2 @@ -10,7 +10,7 @@ services: networks: - net {% endif %} -{% if service.ports is iterable %} +{% if service.ports is defined and service.ports is iterable %} {% if service.ports[0].internal != 'proxy_only' %} ports: {% for port in service.ports %} diff --git a/roles/reverse_proxy/templates/Caddyfile.j2 b/roles/reverse_proxy/templates/Caddyfile.j2 index 97cf1bb..0af73e0 100644 --- a/roles/reverse_proxy/templates/Caddyfile.j2 +++ b/roles/reverse_proxy/templates/Caddyfile.j2 @@ -4,6 +4,7 @@ } {% for service in services %} +{% if service.ports is defined %} {% if service.ports is iterable %} {% set http_port = service.ports | selectattr('name', 'equalto', 'http') | map(attribute='external') | list %} {% if http_port %} @@ -26,6 +27,8 @@ resolvers 1.1.1.1 } } + +{% endif %} {% endif %} {% endif %} {% endfor %}