Skip to content

Commit

Permalink
Drop external role and collection requirements (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
teddyphreak authored Nov 26, 2023
1 parent 58a6cce commit 010d2c1
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 22 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 `

Expand Down
3 changes: 0 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions install/playbook.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
---
- name: Perform local docker install

hosts: localhost

roles:

- nephelaiio.plugins
- nephelaiio.docker
6 changes: 1 addition & 5 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
5 changes: 1 addition & 4 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
---
roles:
- name: robertdebock.update
- nephelaiio.pip
collections:
- community.docker
- nephelaiio.plugins
collections: []
5 changes: 4 additions & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- apt-transport-https
- ca-certificates
- python3-docker
- python3-pip
- curl

- name: Install apt key
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 010d2c1

Please sign in to comment.