container: reset variables in role init, define more defaults outside tasks
This commit is contained in:
@@ -1,12 +1,18 @@
|
||||
---
|
||||
|
||||
- name: Reset variables
|
||||
set_fact:
|
||||
docker_volume_definition: []
|
||||
container_published_ports: []
|
||||
final_docker_volumes: "{{ docker_volumes }}"
|
||||
|
||||
- name: Set docker service full name
|
||||
set_fact:
|
||||
docker_service_name: "{{ docker_service }}_{{ docker_service_suffix }}"
|
||||
when: docker_service_suffix is defined
|
||||
|
||||
- name: Convert docker_volumes from legacy format
|
||||
when: docker_volumes is defined and docker_volumes[0] is not mapping
|
||||
when: docker_volumes | length > 0 and docker_volumes[0] is not mapping
|
||||
block:
|
||||
- name: Warn about docker_volumes legacy format
|
||||
debug:
|
||||
|
||||
@@ -57,8 +57,8 @@
|
||||
image: "{{ docker_built_image.image.Id if dockerfile is defined and not ansible_check_mode else docker_image }}"
|
||||
user: "{{ docker_user | default(omit) }}"
|
||||
pull: "{{ dockerfile is not defined }}"
|
||||
volumes: "{{ docker_volume_definition | default(omit) }}"
|
||||
published_ports: "{{ container_published_ports | default([]) + docker_published_ports | default(omit) }}"
|
||||
volumes: "{{ docker_volume_definition }}"
|
||||
published_ports: "{{ container_published_ports + docker_published_ports }}"
|
||||
labels: "{{ traefik_labels | default(omit) }}"
|
||||
env: "{{ docker_env | combine(docker_additional_env) }}"
|
||||
entrypoint: "{{ docker_entrypoint | default(omit) }}"
|
||||
|
||||
@@ -38,18 +38,18 @@
|
||||
loop: "{{ docker_volumes }}"
|
||||
- name: Set docker_volume_definition for named binds
|
||||
set_fact:
|
||||
docker_volume_definition: "{{ docker_volume_definition | default([]) + [docker_mounts_dir + '/' + item.name + ':' + item.path] }}"
|
||||
docker_volume_definition: "{{ docker_volume_definition + [docker_mounts_dir + '/' + item.name + ':' + item.path] }}"
|
||||
when: item.name is defined
|
||||
loop: "{{ docker_volumes }}"
|
||||
|
||||
- name: Set docker_volume_definition for src binds
|
||||
set_fact:
|
||||
docker_volume_definition: "{{ docker_volume_definition | default([]) + [item.src + ':' + item.path] }}"
|
||||
docker_volume_definition: "{{ docker_volume_definition + [item.src + ':' + item.path] }}"
|
||||
when: item.src is defined
|
||||
loop: "{{ final_docker_volumes }}"
|
||||
|
||||
- name: Set docker_volume_definition for named volumes
|
||||
set_fact:
|
||||
docker_volume_definition: "{{ docker_volume_definition | default([]) + [item.name + ':' + item.path] }}"
|
||||
docker_volume_definition: "{{ docker_volume_definition + [item.name + ':' + item.path] }}"
|
||||
when: docker_volume_type == 'named' and item.name is defined
|
||||
loop: "{{ final_docker_volumes }}"
|
||||
|
||||
Reference in New Issue
Block a user