Merge branch 'ansible-collections:main' into docker-image-export-platform

.github/workflows/docker-images.yml

@@ -77,11 +77,11 @@ jobs:
         env:
           IMAGE: ${{ matrix.name }}:${{ matrix.tag }}
         run: >-
-          podman push "${IMAGE}" "${CONTAINER_REGISTRY}/${IMAGE}" --tls-verify=true --creds=${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}
+          podman manifest push --all "${IMAGE}" "${CONTAINER_REGISTRY}/${IMAGE}" --tls-verify=true --creds=${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish container image ${{ env.CONTAINER_REGISTRY }}/${{ matrix.name }}:latest
         if: github.event_name != 'pull_request' && matrix.tag-as-latest && matrix.tag != 'latest'
         env:
           IMAGE: ${{ matrix.name }}:latest
         run: >-
-          podman push "${IMAGE}" "${CONTAINER_REGISTRY}/${IMAGE}" --tls-verify=true --creds=${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}
+          podman manifest push --all "${IMAGE}" "${CONTAINER_REGISTRY}/${IMAGE}" --tls-verify=true --creds=${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}

changelogs/fragments/5.1.0.yml

@@ -0,0 +1 @@
+release_summary: Feature release.

tests/integration/targets/setup_docker/tasks/Debian.yml

@@ -9,38 +9,32 @@
 
 - name: Install pre-reqs
   ansible.builtin.apt:
-    name: '{{ docker_prereq_packages }}'
+    name: '{{ docker_prereq_packages + ["python3-debian"] }}'
     state: present
     update_cache: true
   notify: cleanup docker
 
-- when:
+- name: Add Docker repo on Ubuntu or Debian
-    - (ansible_facts.distribution == "Ubuntu" and (ansible_facts.distribution_major_version | int) >= 22) or
+  ansible.builtin.deb822_repository:
-      (ansible_facts.distribution == "Debian" and (ansible_facts.distribution_major_version | int) >= 12)
+    name: docker
-  name: Add Docker repo on Ubuntu 22+ or Debian 12+
+    types: deb
-  block:
+    architectures:
-    - name: Add gpg key
+      - >-
-      ansible.builtin.get_url:
+        {{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }}
-        url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg"
+    signed_by: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg"
-        dest: /etc/apt/keyrings/docker.asc
+    uris:
+      - https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}
+    suites:
+      - "{{ ansible_facts.distribution_release }}"
+    components:
+      - stable
+    state: present
+  register: apt_repo
 
-    - name: Add Docker repo
+- name: Update apt cache
-      ansible.builtin.apt_repository:
+  ansible.builtin.apt:
-        repo: deb [arch={{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_facts.distribution | lower }} {{ ansible_facts.distribution_release }} stable
+    update_cache: true
-        state: present
+  when: apt_repo is changed
-
-- when:
-    - (ansible_facts.distribution == "Ubuntu" and (ansible_facts.distribution_major_version | int) < 22) or
-      (ansible_facts.distribution == "Debian" and (ansible_facts.distribution_major_version | int) < 12)
-  name: Add Docker repo on Ubuntu 20 or before, or Debian 11 or before
-  block:
-    - name: Add gpg key
-      ansible.builtin.shell: curl -fsSL https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg >key && apt-key add key  # noqa: command-instead-of-module
-
-    - name: Add Docker repo
-      ansible.builtin.apt_repository:
-        repo: deb [arch={{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/{{ ansible_facts.distribution | lower }} {{ ansible_facts.distribution_release }} stable
-        state: present
 
 - block:
     - name: Prevent service restart