From 05c4b48b2bc5b3dd2d67be98a1a91a78d40816b2 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 20 Mar 2026 08:07:26 +0100 Subject: [PATCH 1/4] Replace apt_repository with deb822_repository. (#1250) --- .../targets/setup_docker/tasks/Debian.yml | 48 ++++++++----------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/tests/integration/targets/setup_docker/tasks/Debian.yml b/tests/integration/targets/setup_docker/tasks/Debian.yml index 5958dbd5..25b90438 100644 --- a/tests/integration/targets/setup_docker/tasks/Debian.yml +++ b/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: - - (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 22+ or Debian 12+ - block: - - name: Add gpg key - ansible.builtin.get_url: - url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg" - dest: /etc/apt/keyrings/docker.asc +- name: Add Docker repo on Ubuntu or Debian + ansible.builtin.deb822_repository: + name: docker + types: deb + architectures: + - >- + {{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }} + signed_by: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg" + 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 - ansible.builtin.apt_repository: - 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 - state: present - -- 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 +- name: Update apt cache + ansible.builtin.apt: + update_cache: true + when: apt_repo is changed - block: - name: Prevent service restart From a54353e2d68479a5f8f1f2ba905ac6033e73e750 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 21 Mar 2026 17:41:39 +0100 Subject: [PATCH 2/4] Push all images. --- .github/workflows/docker-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 1d72295f..44aeec98 100644 --- a/.github/workflows/docker-images.yml +++ b/.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 push "${IMAGE}" "${CONTAINER_REGISTRY}/${IMAGE}" --all --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 push "${IMAGE}" "${CONTAINER_REGISTRY}/${IMAGE}" --all --tls-verify=true --creds=${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} From 639c2391e85f7dc4d3fcb887db8df7be13786046 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 21 Mar 2026 17:44:35 +0100 Subject: [PATCH 3/4] Use podman manifest push instead of podman push. --- .github/workflows/docker-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 44aeec98..fa92456b 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -77,11 +77,11 @@ jobs: env: IMAGE: ${{ matrix.name }}:${{ matrix.tag }} run: >- - podman push "${IMAGE}" "${CONTAINER_REGISTRY}/${IMAGE}" --all --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}" --all --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 }} From e81d5883ef639697f57467e32efe57b5d19d3a51 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 21 Mar 2026 23:10:50 +0100 Subject: [PATCH 4/4] Prepare 5.1.0 release. --- changelogs/fragments/5.1.0.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/fragments/5.1.0.yml diff --git a/changelogs/fragments/5.1.0.yml b/changelogs/fragments/5.1.0.yml new file mode 100644 index 00000000..512efc99 --- /dev/null +++ b/changelogs/fragments/5.1.0.yml @@ -0,0 +1 @@ +release_summary: Feature release.