From 4d4ade6ae24d0929501033b34e21a5a18a57ced9 Mon Sep 17 00:00:00 2001 From: uumas Date: Thu, 24 Apr 2025 00:53:39 +0300 Subject: [PATCH] Fix docker_published_ports not working when set to db_published_ports --- roles/service/tasks/init.yml | 1 + roles/service/tasks/main.yml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/service/tasks/init.yml b/roles/service/tasks/init.yml index 749dc1a..39902b1 100644 --- a/roles/service/tasks/init.yml +++ b/roles/service/tasks/init.yml @@ -10,6 +10,7 @@ _docker_service_name: "{{ docker_service_name }}" _docker_mount_definition: "{{ docker_mount_definition }}" _container_published_ports: "{{ container_published_ports }}" + _docker_published_ports: "{{ docker_published_ports }}" _container_image: "{{ container_image }}" _container_networks: "{{ container_networks }}" _template_mounts_needed: "{{ template_mounts_needed }}" diff --git a/roles/service/tasks/main.yml b/roles/service/tasks/main.yml index 29736d2..c99e949 100644 --- a/roles/service/tasks/main.yml +++ b/roles/service/tasks/main.yml @@ -1,6 +1,6 @@ --- -- name: Container role initialization +- name: Role initialization import_tasks: init.yml - name: Docker network @@ -101,7 +101,7 @@ image: "{{ container_image.Id if (not ansible_check_mode) or (container_image | length > 0) else docker_image }}" user: "{{ docker_user if docker_host_user else omit }}" mounts: "{{ docker_mount_definition }}" - published_ports: "{{ container_published_ports + docker_published_ports }}" + published_ports: "{{ container_published_ports + _docker_published_ports }}" labels: "{{ traefik_labels | default(omit) }}" env: "{{ docker_env | combine(docker_additional_env) | combine({'TZ': timezone}) }}" entrypoint: "{{ docker_entrypoint | default(omit) }}" @@ -123,6 +123,7 @@ docker_service_name: "{{ _docker_service_name }}" docker_mount_definition: "{{ _docker_mount_definition }}" container_published_ports: "{{ _container_published_ports }}" + docker_published_ports: "{{ _docker_published_ports }}" container_image: "{{ _container_image }}" container_networks: "{{ _container_networks }}" template_mounts_needed: "{{ _template_mounts_needed }}"