Fix docker_published_ports not working when set to db_published_ports
This commit is contained in:
@@ -10,6 +10,7 @@
|
|||||||
_docker_service_name: "{{ docker_service_name }}"
|
_docker_service_name: "{{ docker_service_name }}"
|
||||||
_docker_mount_definition: "{{ docker_mount_definition }}"
|
_docker_mount_definition: "{{ docker_mount_definition }}"
|
||||||
_container_published_ports: "{{ container_published_ports }}"
|
_container_published_ports: "{{ container_published_ports }}"
|
||||||
|
_docker_published_ports: "{{ docker_published_ports }}"
|
||||||
_container_image: "{{ container_image }}"
|
_container_image: "{{ container_image }}"
|
||||||
_container_networks: "{{ container_networks }}"
|
_container_networks: "{{ container_networks }}"
|
||||||
_template_mounts_needed: "{{ template_mounts_needed }}"
|
_template_mounts_needed: "{{ template_mounts_needed }}"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- name: Container role initialization
|
- name: Role initialization
|
||||||
import_tasks: init.yml
|
import_tasks: init.yml
|
||||||
|
|
||||||
- name: Docker network
|
- name: Docker network
|
||||||
@@ -101,7 +101,7 @@
|
|||||||
image: "{{ container_image.Id if (not ansible_check_mode) or (container_image | length > 0) else docker_image }}"
|
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 }}"
|
user: "{{ docker_user if docker_host_user else omit }}"
|
||||||
mounts: "{{ docker_mount_definition }}"
|
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) }}"
|
labels: "{{ traefik_labels | default(omit) }}"
|
||||||
env: "{{ docker_env | combine(docker_additional_env) | combine({'TZ': timezone}) }}"
|
env: "{{ docker_env | combine(docker_additional_env) | combine({'TZ': timezone}) }}"
|
||||||
entrypoint: "{{ docker_entrypoint | default(omit) }}"
|
entrypoint: "{{ docker_entrypoint | default(omit) }}"
|
||||||
@@ -123,6 +123,7 @@
|
|||||||
docker_service_name: "{{ _docker_service_name }}"
|
docker_service_name: "{{ _docker_service_name }}"
|
||||||
docker_mount_definition: "{{ _docker_mount_definition }}"
|
docker_mount_definition: "{{ _docker_mount_definition }}"
|
||||||
container_published_ports: "{{ _container_published_ports }}"
|
container_published_ports: "{{ _container_published_ports }}"
|
||||||
|
docker_published_ports: "{{ _docker_published_ports }}"
|
||||||
container_image: "{{ _container_image }}"
|
container_image: "{{ _container_image }}"
|
||||||
container_networks: "{{ _container_networks }}"
|
container_networks: "{{ _container_networks }}"
|
||||||
template_mounts_needed: "{{ _template_mounts_needed }}"
|
template_mounts_needed: "{{ _template_mounts_needed }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user