install python3-docker instead of from pip following pep668
Some checks failed
test / Linting (push) Successful in 35s
test / Molecule tests (default, debian12) (push) Failing after 1m53s
test / Molecule tests (default, debian11) (push) Failing after 2m20s
test / Molecule tests (default, ubuntu2004) (push) Failing after 2m28s
test / Molecule tests (with_custom_config, debian11) (push) Successful in 1m38s
test / Molecule tests (default, ubuntu2204) (push) Failing after 2m2s
test / Molecule tests (with_custom_config, debian12) (push) Successful in 1m50s
test / Molecule tests (with_custom_config, ubuntu2204) (push) Successful in 1m39s
test / Molecule tests (with_custom_config, ubuntu2004) (push) Successful in 2m6s

This commit is contained in:
Bertrand Lanson 2023-08-29 23:13:59 +02:00
parent f3446af6d6
commit a0e77bafb3
7 changed files with 16 additions and 25 deletions

View File

@ -3,4 +3,3 @@
roles:
- name: ednxzu.manage_repositories
- name: ednxzu.manage_apt_packages
- name: ednxzu.manage_pip_packages

View File

@ -3,4 +3,3 @@
roles:
- name: ednxzu.manage_repositories
- name: ednxzu.manage_apt_packages
- name: ednxzu.manage_pip_packages

View File

@ -109,18 +109,12 @@
- name: "Test: python package docker"
block:
- name: "Command pip3 list -o"
ansible.builtin.command: "pip3 list -o"
- name: "Command pip3 list"
ansible.builtin.command: "pip3 list"
changed_when: false
register: pip3_list_outdated
- name: "Command pip3 list -u"
ansible.builtin.command: "pip3 list -u"
changed_when: false
register: pip3_list_uptodate
register: pip3_list
- name: "Verify python package docker"
ansible.builtin.assert:
that:
- "'docker' not in pip3_list_outdated.stdout"
- "'docker' in pip3_list_uptodate.stdout"
- "'docker' in pip3_list.stdout"

View File

@ -1,8 +0,0 @@
---
# task/install_docker_pip file for install_docker
- name: "Install docker python packages"
ansible.builtin.include_role:
name: ednxzu.manage_pip_packages
vars:
manage_pip_packages_install_prereqs: false
manage_pip_packages_list: "{{ install_docker_pip_packages }}"

View File

@ -0,0 +1,7 @@
---
# task/install_docker_pip file for install_docker
- name: "Install docker packages"
ansible.builtin.include_role:
name: ednxzu.manage_apt_packages
vars:
manage_apt_packages_list: "{{ install_docker_python_packages }}"

View File

@ -10,8 +10,8 @@
ansible.builtin.include_tasks: install_compose.yml
when: install_docker_compose
- name: "Import install_docker_pip.yml"
ansible.builtin.include_tasks: install_docker_pip.yml
- name: "Import install_python_docker.yml"
ansible.builtin.include_tasks: install_python_docker.yml
when: install_docker_python_packages
- name: "Import configure.yml"

View File

@ -18,9 +18,9 @@ install_docker_packages:
- name: "containerd.io"
version: latest
state: "{% if install_docker_auto_update %}latest{% else %}present{% endif %}"
install_docker_pip_packages:
- name: docker
version_constraint: latest
install_docker_python_packages:
- name: python3-docker
version: latest
state: "{% if install_docker_auto_update %}latest{% else %}present{% endif %}"
install_docker_repository:
- uri: "https://download.docker.com/linux/{{ ansible_distribution|lower }}"