container: switch to fqcns

This commit is contained in:
uumas
2023-12-21 01:12:02 +02:00
parent 22227d9ffc
commit d80641623e

View File

@@ -7,16 +7,16 @@
when: docker_network_mode is not defined or docker_network_mode != 'host' or docker_networks | length > 0
block:
- name: Set networks variable to {{ docker_service_name }}
set_fact:
ansible.builtin.set_fact:
container_networks:
- name: "{{ docker_service_name }}"
when: docker_networks | length == 0
- name: Set networks variable to {{ docker_networks }}
set_fact:
ansible.builtin.set_fact:
container_networks: "{{ docker_networks }}"
when: docker_networks | length > 0
- name: Create docker networks
docker_network:
community.docker.docker_network:
name: "{{ item.name }}"
loop: "{{ container_networks }}"
@@ -25,7 +25,7 @@
when: reverse_proxy_type != 'none'
- name: Create directory /opt/{{ docker_service }}
file:
ansible.builtin.file:
path: "/opt/{{ docker_service }}"
state: directory
mode: 0755
@@ -42,18 +42,18 @@
when: create_opt_directory and docker_service_suffix is defined
block:
- name: Create directory /opt/{{ docker_service + '/' + docker_service_suffix }}
file:
ansible.builtin.file:
path: "/opt/{{ docker_service }}/{{ docker_service_suffix }}"
state: directory
owner: "{{ user.uid | default(omit) }}"
group: "{{ user.group | default(omit) }}"
mode: 0755
- name: Set container_workdir variable
set_fact:
ansible.builtin.set_fact:
container_workdir: /opt/{{ docker_service }}/{{ docker_service_suffix }}
- name: Set container_workdir variable
set_fact:
ansible.builtin.set_fact:
container_workdir: /opt/{{ docker_service }}
when: docker_service_suffix is not defined
@@ -61,11 +61,11 @@
when: create_mounts_directory
block:
- name: Set docker_mounts_dir
set_fact:
ansible.builtin.set_fact:
docker_mounts_dir: "{{ container_workdir }}/mounts"
- name: Create directory {{ docker_mounts_dir }}
file:
ansible.builtin.file:
path: "{{ docker_mounts_dir }}"
state: directory
owner: "{{ user.uid | default(omit) }}"
@@ -84,7 +84,7 @@
import_tasks: volumes.yml
- name: "Container for {{ docker_service_name }}"
docker_container:
community.docker.docker_container:
name: "{{ docker_service_name }}"
image: "{{ container_image.Id if container_image != '' else docker_image }}"
user: "{{ docker_user if docker_host_user else omit }}"
@@ -101,6 +101,6 @@
register: container_out
- name: Reset docker_mounts if converted from docker_volumes
set_fact:
ansible.builtin.set_fact:
docker_mounts: []
when: final_docker_volumes | length > 0