ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-07-29 11:55:04 +00:00
Code Packages Projects Releases Wiki Activity

CI: Start using Ubuntu VMs instead of RHEL VMs (#1128)

Browse Source 
* Start using Ubuntu VMs instead of RHEL VMs.

* Use correct Python executable.

* Fix starting podman on non-RHEL systems.
This commit is contained in:
Felix Fontein
2025-09-14 23:27:52 +02:00
committed by GitHub
parent 93d165e10b
commit 2b5c06da20
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/targets/docker_config/tasks/test_docker_config.yml
+2 -2
View File
@@ -4,14 +4,14 @@
# SPDX-License-Identifier: GPL-3.0-or-later
- block:
- shell: "docker info --format '{% raw %}{{json .}}{% endraw %}' | python -m json.tool"
- shell: "docker info --format '{% raw %}{{json .}}{% endraw %}' | {{ ansible_python_interpreter }} -m json.tool"
- name: Make sure we're not already using Docker swarm
docker_swarm:
state: absent
force: true
- shell: "docker info --format '{% raw %}{{json .}}{% endraw %}' | python -m json.tool"
- shell: "docker info --format '{% raw %}{{json .}}{% endraw %}' | {{ ansible_python_interpreter }} -m json.tool"
- name: Create a Swarm cluster
docker_swarm:
tests/integration/targets/setup_podman/tasks/main.yml
+1 -1
View File
@@ -57,7 +57,7 @@
systemd_service:
name: "{{ podman_socket_service }}"
state: started
scope: "{{ 'global' if podman_user_id.stdout == '0' else 'user' }}"
scope: "{{ 'global' if podman_user_id.stdout == '0' and ansible_facts.os_family == 'RedHat' else 'user' }}"
environment:
XDG_RUNTIME_DIR: "{{ '/run' if podman_user_id.stdout == '0' else ('/run/user/' ~ podman_user_id.stdout) }}"