docker_image(_push): fix push detection (#1199) (#1200)

* Fix IP address retrieval for registry setup.

* Adjust push detection to Docker 29.

* Idempotency for export no longer works.

* Disable pull idempotency checks that play with architecture.

* Add more known image IDs.

* Adjust load tests.

* Adjust error message check.

* Allow for more digests.

* Make sure a new enough cryptography version is installed.

(cherry picked from commit d207643e0c)

tests/integration/targets/docker_image_pull/tasks/tests/basic.yml

@@ -142,6 +142,8 @@
           - present_3_check.actions[0] == ('Pulled image ' ~ image_name)
           - present_3_check.diff.before.id == present_1.diff.after.id
           - present_3_check.diff.after.id == 'unknown'
+    - ansible.builtin.assert:
+        that:
           - present_3 is changed
           - present_3.actions | length == 1
           - present_3.actions[0] == ('Pulled image ' ~ image_name)
@@ -166,6 +168,11 @@
           - present_5.actions[0] == ('Pulled image ' ~ image_name)
           - present_5.diff.before.id == present_3.diff.after.id
           - present_5.diff.after.id == present_1.diff.after.id
+      when: docker_cli_version is version("29.0.0", "<")
+      # From Docker 29 on, Docker won't pull images for other architectures
+      # if there are better matching ones. The above tests assume it will
+      # just do what it is told, and thus fail from 29.0.0 on.
+      # https://github.com/ansible-collections/community.docker/pull/1199
 
   always:
     - name: cleanup

tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml

@@ -7,11 +7,9 @@
   block:
     - name: Make sure images are not there
       docker_image_remove:
-        name: "{{ item }}"
+        name: "sha256:{{ item }}"
         force: true
-      loop:
-        - "sha256:{{ docker_test_image_digest_v1_image_id }}"
-        - "sha256:{{ docker_test_image_digest_v2_image_id }}"
+      loop: "{{ docker_test_image_digest_v1_image_ids + docker_test_image_digest_v2_image_ids }}"
 
     - name: Pull image 1
       docker_image_pull:
@@ -82,8 +80,6 @@
   always:
     - name: cleanup
       docker_image_remove:
-        name: "{{ item }}"
+        name: "sha256:{{ item }}"
         force: true
-      loop:
-        - "sha256:{{ docker_test_image_digest_v1_image_id }}"
-        - "sha256:{{ docker_test_image_digest_v2_image_id }}"
+      loop: "{{ docker_test_image_digest_v1_image_ids + docker_test_image_digest_v2_image_ids }}"