diff --git a/defaults/main.yml b/defaults/main.yml index 870a94c..ec9b812 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -7,6 +7,7 @@ docker_packages: - "docker-{{ docker_edition }}-rootless-extras" - "containerd.io" docker_packages_state: present +docker_rootless: false # Service options. docker_service_manage: true diff --git a/tasks/main.yml b/tasks/main.yml index dcd47de..b979df2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -65,13 +65,17 @@ when: docker_daemon_options.keys() | length > 0 notify: restart docker -- name: Ensure Docker is started and enabled at boot. +- name: Ensure Docker is started and enabled at boot service: name: docker state: "{{ docker_service_state }}" enabled: "{{ docker_service_enabled }}" ignore_errors: "{{ ansible_check_mode }}" - when: docker_service_manage | bool + when: docker_service_manage | bool and docker_rootless == false + +- name: Setting up docker daemon as non-root + include_tasks: docker-rootless.yml + when: docker_rootless == true - name: Ensure handlers are notified now to avoid firewall conflicts. meta: flush_handlers