ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-07-29 11:55:04 +00:00
Code Packages Projects Releases Wiki Activity

Use ansible_facts.xxx instead of ansible_xxx. (#1237)

Browse Source
This commit is contained in:
Felix Fontein
2026-02-07 16:00:22 +01:00
committed by GitHub
parent 14be59e7e4
commit 85a3c811cb
65 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/targets/setup_docker/tasks/Debian.yml
+4 -4
View File
@@ -21,12 +21,12 @@
block:
- name: Add gpg key
ansible.builtin.get_url:
url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg"
url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg"
dest: /etc/apt/keyrings/docker.asc
- name: Add Docker repo
ansible.builtin.apt_repository:
repo: deb [arch={{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable
repo: deb [arch={{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_facts.distribution | lower }} {{ ansible_facts.distribution_release }} stable
state: present
- when:
@@ -35,11 +35,11 @@
name: Add Docker repo on Ubuntu 20 or before, or Debian 11 or before
block:
- name: Add gpg key
ansible.builtin.shell: curl -fsSL https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg >key && apt-key add key # noqa: command-instead-of-module
ansible.builtin.shell: curl -fsSL https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg >key && apt-key add key # noqa: command-instead-of-module
- name: Add Docker repo
ansible.builtin.apt_repository:
repo: deb [arch={{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable
repo: deb [arch={{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/{{ ansible_facts.distribution | lower }} {{ ansible_facts.distribution_release }} stable
state: present
- block:
tests/integration/targets/setup_docker/tasks/RedHat-10.yml
+1 -1
View File
@@ -35,5 +35,5 @@
ansible.builtin.service:
name: docker
state: started
ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}"
ignore_errors: "{{ ansible_facts.virtualization_type in ['docker', 'container', 'containerd'] }}"
when: needs_docker_daemon
tests/integration/targets/setup_docker/tasks/RedHat-7.yml
+1 -1
View File
@@ -42,5 +42,5 @@
ansible.builtin.service:
name: docker
state: started
ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}"
ignore_errors: "{{ ansible_facts.virtualization_type in ['docker', 'container', 'containerd'] }}"
when: needs_docker_daemon
tests/integration/targets/setup_docker/tasks/RedHat-8.yml
+1 -1
View File
@@ -35,5 +35,5 @@
ansible.builtin.service:
name: docker
state: started
ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}"
ignore_errors: "{{ ansible_facts.virtualization_type in ['docker', 'container', 'containerd'] }}"
when: needs_docker_daemon
tests/integration/targets/setup_docker/tasks/RedHat-9.yml
+1 -1
View File
@@ -35,5 +35,5 @@
ansible.builtin.service:
name: docker
state: started
ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}"
ignore_errors: "{{ ansible_facts.virtualization_type in ['docker', 'container', 'containerd'] }}"
when: needs_docker_daemon
tests/integration/targets/setup_docker/tasks/main.yml
+2 -2
View File
@@ -23,7 +23,7 @@
block:
- name: Determine whether Docker Daemon needs to be installed
ansible.builtin.set_fact:
needs_docker_daemon: '{{ not ansible_module_running_in_container }}'
needs_docker_daemon: '{{ not ansible_facts.module_running_in_container }}'
- name: Print information
ansible.builtin.debug:
@@ -62,7 +62,7 @@
ansible.builtin.service:
name: docker
state: started
when: not ansible_module_running_in_container
when: not ansible_facts.module_running_in_container
- name: Set marker that Docker was already set up
ansible.builtin.file: