From 3c670d58323319b139485283d4ef233149b5ca8a Mon Sep 17 00:00:00 2001 From: uumas Date: Fri, 3 Feb 2023 05:06:58 +0200 Subject: [PATCH] container: run proxy tasks only when proxy will be installed, proxy cleanup --- roles/container/tasks/main.yml | 3 ++- roles/container/tasks/proxy.yml | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/roles/container/tasks/main.yml b/roles/container/tasks/main.yml index 9158f12..034f748 100644 --- a/roles/container/tasks/main.yml +++ b/roles/container/tasks/main.yml @@ -15,7 +15,8 @@ when: docker_network_mode is not defined or docker_network_mode != 'host' - name: Reverse proxy for container - import_tasks: proxy.yml + include_tasks: proxy.yml + when: reverse_proxy_type != 'none' - name: Database container include_tasks: database.yml diff --git a/roles/container/tasks/proxy.yml b/roles/container/tasks/proxy.yml index 79963d6..e328f70 100644 --- a/roles/container/tasks/proxy.yml +++ b/roles/container/tasks/proxy.yml @@ -8,12 +8,14 @@ proxy_target_protocol: "{{ docker_proxy_target_protocol }}" vhost_domains: "{{ docker_vhost_domains[docker_service_name] }}" proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}" - when: reverse_proxy_type != 'none' and reverse_proxy_type != 'traefik' + when: reverse_proxy_type != 'traefik' -- name: Set published ports variable +- name: Set published ports variable to http port set_fact: container_published_ports: ["127.0.0.1:{{ ports[docker_service_name][docker_proxy_target_protocol] }}:{{ docker_image_http_port }}"] - when: reverse_proxy_type != 'traefik' and (docker_network_mode is not defined or docker_network_mode != 'host') + when: + - docker_network_mode is not defined or docker_network_mode != 'host' + - reverse_proxy_type != 'traefik' - name: Include traefik vars include_vars: traefik.yml