diff --git a/README.md b/README.md index 44e5059..a3539de 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # nephelaiio.docker -[![Build Status](https://github.com/nephelaiio/ansible-role-docker/workflows/molecule/badge.svg)](https://github.com/nephelaiio/ansible-role-docker/actions/worfklows/molecule.yml) [![Build Status](https://github.com/nephelaiio/ansible-role-docker/workflows/install/badge.svg)](https://github.com/nephelaiio/ansible-role-docker/actions/workflows/install.yml) [![Build Status](https://github.com/nephelaiio/ansible-role-docker/workflows/release/badge.svg)](https://github.com/nephelaiio/ansible-role-docker/actions/workflows/release.yml) -[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-nephelaiio.docker-blue.svg)](https://galaxy.ansible.com/nephelaiio/docker/) +[![Build Status](https://github.com/nephelaiio/ansible-role-docker/workflows/molecule.yml/badge.svg)](https://github.com/nephelaiio/ansible-role-docker/actions/worfklows/molecule.yml) [![Build Status](https://github.com/nephelaiio/ansible-role-docker/workflows/install/badge.svg)](https://github.com/nephelaiio/ansible-role-docker/actions/workflows/install.yml) [![Build Status](https://github.com/nephelaiio/ansible-role-docker/workflows/release/badge.svg)](https://github.com/nephelaiio/ansible-role-docker/actions/workflows/release.yml) +[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-nephelaiio.docker-blue.svg)](https://galaxy.ansible.com/ui/standalone/roles/nephelaiio/docker) -An [ansible role](https://galaxy.ansible.com/nephelaiio/docker) to install and configure [Docker](https://www.docker.com) +An [ansible role](https://galaxy.ansible.com/ui/standalone/roles/nephelaiio/docker) to install and configure [Docker](https://www.docker.com) ## Local install @@ -31,10 +31,11 @@ Please refer to the [defaults file](/defaults/main.yml) for an up to date list o Please make sure your environment has [docker](https://www.docker.com) installed in order to run role validation tests. Additional python dependencies are listed in the [requirements file](https://github.com/nephelaiio/ansible-role-requirements/blob/master/requirements.txt) Role is tested against the following distributions (docker images): + * Ubuntu Jammy * Ubuntu Focal - * Ubuntu Bionic * Debian Bookworm - * Debian Stretch + * Debian Bullseye + * Rocky Linux 9 You can test the role directly from sources using command ` molecule test ` diff --git a/defaults/main.yml b/defaults/main.yml index 402d811..c84e132 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,9 +14,6 @@ docker_packages: - docker-ce-cli - containerd.io -docker_pip_helpers: - - docker - docker_packages_state: present docker_configuration_template: mountflags.conf.j2 docker_configuration_file: /etc/systemd/system/docker.service.d/mountflags.conf diff --git a/install/playbook.yml b/install/playbook.yml index 5109a1e..19725e7 100644 --- a/install/playbook.yml +++ b/install/playbook.yml @@ -1,9 +1,5 @@ --- - name: Perform local docker install - hosts: localhost - roles: - - - nephelaiio.plugins - nephelaiio.docker diff --git a/meta/main.yml b/meta/main.yml index 4217ff2..d80ec09 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -22,8 +22,4 @@ galaxy_info: galaxy_tags: - docker -dependencies: - - role: nephelaiio.plugins - - role: nephelaiio.pip - vars: - pip_pip_names: "{{ docker_pip_helpers | default(docker_pip_helpers_default) }}" +dependencies: [] diff --git a/requirements.yml b/requirements.yml index 1c52fe1..54faa7f 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,4 @@ --- roles: - name: robertdebock.update - - nephelaiio.pip -collections: - - community.docker - - nephelaiio.plugins +collections: [] diff --git a/tasks/main.yml b/tasks/main.yml index e392efd..fbef1b1 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -19,6 +19,7 @@ - apt-transport-https - ca-certificates - python3-docker + - python3-pip - curl - name: Install apt key @@ -55,7 +56,9 @@ - name: Install RedHat package helpers ansible.builtin.package: - name: python3-docker + name: + - python3-pip + - python3-docker - name: Install yum repository ansible.builtin.get_url: