samip5/ansible-docker
1
0
Fork 0
forked from uumas/ansible-docker
Code Issues Pull Requests Packages Projects Releases Wiki Activity

container: reset variables in role init, define more defaults outside tasks

Browse Source
This commit is contained in:
uumas
2023-02-03 05:01:42 +02:00
parent a58c5bd47b
commit 4c6363cab0
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/container/tasks/init.yml
View File

@@ -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 - name: Set docker service full name
set_fact: set_fact:
docker_service_name: "{{ docker_service }}_{{ docker_service_suffix }}" docker_service_name: "{{ docker_service }}_{{ docker_service_suffix }}"
when: docker_service_suffix is defined when: docker_service_suffix is defined
- name: Convert docker_volumes from legacy format - 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: block:
- name: Warn about docker_volumes legacy format - name: Warn about docker_volumes legacy format
debug: debug:

4
roles/container/tasks/main.yml
View File

@@ -57,8 +57,8 @@
image: "{{ docker_built_image.image.Id if dockerfile is defined and not ansible_check_mode else docker_image }}" image: "{{ docker_built_image.image.Id if dockerfile is defined and not ansible_check_mode else docker_image }}"
user: "{{ docker_user | default(omit) }}" user: "{{ docker_user | default(omit) }}"
pull: "{{ dockerfile is not defined }}" pull: "{{ dockerfile is not defined }}"
volumes: "{{ docker_volume_definition | default(omit) }}" volumes: "{{ docker_volume_definition }}"
published_ports: "{{ container_published_ports | default([]) + docker_published_ports | default(omit) }}" 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) }}" env: "{{ docker_env | combine(docker_additional_env) }}"
entrypoint: "{{ docker_entrypoint | default(omit) }}" entrypoint: "{{ docker_entrypoint | default(omit) }}"

6
roles/container/tasks/volumes.yml
View File

@@ -38,18 +38,18 @@
loop: "{{ docker_volumes }}" loop: "{{ docker_volumes }}"
- name: Set docker_volume_definition for named binds - name: Set docker_volume_definition for named binds
set_fact: 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 when: item.name is defined
loop: "{{ docker_volumes }}" loop: "{{ docker_volumes }}"
- name: Set docker_volume_definition for src binds - name: Set docker_volume_definition for src binds
set_fact: 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 when: item.src is defined
loop: "{{ final_docker_volumes }}" loop: "{{ final_docker_volumes }}"
- name: Set docker_volume_definition for named volumes - name: Set docker_volume_definition for named volumes
set_fact: 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 when: docker_volume_type == 'named' and item.name is defined
loop: "{{ final_docker_volumes }}" loop: "{{ final_docker_volumes }}"

2
roles/container/vars/main.yml
View File

@@ -1,11 +1,11 @@
--- ---
final_docker_volumes: "{{ docker_volumes }}"
docker_service_name: "{{ docker_service }}" docker_service_name: "{{ docker_service }}"
reverse_proxy_type: caddy reverse_proxy_type: caddy
docker_proxy_target_protocol: http docker_proxy_target_protocol: http
docker_additional_env: {} docker_additional_env: {}
docker_volumes: []
docker_published_ports: [] docker_published_ports: []