diff options
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/handlers/main.yml | 9 | ||||
| -rw-r--r-- | roles/docker/tasks/logging.yml | 4 | ||||
| -rw-r--r-- | roles/docker/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/docker/tasks/prune.yml | 8 |
4 files changed, 17 insertions, 16 deletions
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml index df1b1a1..cee8a9a 100644 --- a/roles/docker/handlers/main.yml +++ b/roles/docker/handlers/main.yml @@ -1,13 +1,14 @@ # Don't restart if it's not running. - name: Collect service facts - ansible.builtin.service_facts: listen: docker_configured + ansible.builtin.service_facts: - name: Restart Docker service - become: true + listen: docker_configured when: | - 'docker.service' in ansible_facts.services and ansible_facts.services['docker.service'].state == 'running' + 'docker.service' in ansible_facts.services + and ansible_facts.services['docker.service'].state == 'running' + become: true ansible.builtin.systemd_service: name: docker state: restarted - listen: docker_configured diff --git a/roles/docker/tasks/logging.yml b/roles/docker/tasks/logging.yml index 52b70c9..d701424 100644 --- a/roles/docker/tasks/logging.yml +++ b/roles/docker/tasks/logging.yml @@ -14,7 +14,7 @@ state: directory owner: root group: root - mode: '755' + mode: '0755' - name: Write daemon.json ansible.builtin.copy: @@ -22,7 +22,7 @@ content: '{{ docker_daemon_json.content | combine({"log-driver": docker_logging_driver}) | to_nice_json }}' owner: root group: root - mode: '644' + mode: '0644' notify: docker_configured - name: Restart Docker service if necessary diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 6e21a2c..9d0eeb6 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -5,13 +5,13 @@ - distribution_release - name: Set platform-specific variables - ansible.builtin.include_vars: "{{ __docker_vars_file }}" loop: - "{{ ansible_facts['distribution'] }}.yml" - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_release'] }}.yml" vars: - __docker_vars_file: "{{ role_path }}/vars/{{ item }}" + __docker_vars_file: '{{ role_path }}/vars/{{ item }}' when: __docker_vars_file is exists + ansible.builtin.include_vars: '{{ __docker_vars_file }}' - name: Configure Docker logging driver when: docker_logging_driver is defined and docker_logging_driver != false @@ -20,7 +20,7 @@ - name: Install Docker become: true ansible.builtin.package: - name: "{{ docker_package_names }}" + name: '{{ docker_package_names }}' state: present # The docker system prune call should be before configuring the service and @@ -32,19 +32,19 @@ become: true ansible.builtin.systemd_service: name: docker.service - enabled: "{{ docker_enable_service }}" + enabled: '{{ docker_enable_service }}' state: "{{ docker_enable_service | ternary('started', 'stopped') }}" - name: Configure Docker socket become: true ansible.builtin.systemd_service: name: docker.socket - enabled: "{{ docker_enable_socket }}" + enabled: '{{ docker_enable_socket }}' state: "{{ docker_enable_socket | ternary('started', 'stopped') }}" - name: Add user to Docker group - become: true when: docker_add_to_group + become: true ansible.builtin.user: append: true groups: docker diff --git a/roles/docker/tasks/prune.yml b/roles/docker/tasks/prune.yml index e6f1f5d..614813c 100644 --- a/roles/docker/tasks/prune.yml +++ b/roles/docker/tasks/prune.yml @@ -3,25 +3,25 @@ unitname: - docker.service - docker.socket - register: docker_systemd_info failed_when: docker_systemd_info.msg is defined - and "No units match any of the provided patterns" not in docker_systemd_info.msg + and 'No units match any of the provided patterns' not in docker_systemd_info.msg # ^^^ On fresh installations, systemctl list-units (which is what systemd_info # does, it doesn't show the Docker units at all, don't exactly understand why. + register: docker_systemd_info - name: Clean up docker data - become: true when: | docker_systemd_info.units is defined and (docker_systemd_info.units['docker.service'].substate == 'running' or docker_systemd_info.units['docker.socket'].substate == 'listening' or docker_systemd_info.units['docker.socket'].substate == 'running') + become: true block: # Dependencies of the community.docker.docker_prune Ansible module: - name: Install module dependencies ansible.builtin.package: - name: "{{ docker_prune_module_deps }}" + name: '{{ docker_prune_module_deps }}' state: present - name: Run docker system prune |