From 0202b47f95a87598276869ab7f07f57e8a4c8a87 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 26 Jun 2024 08:22:15 +0200
Subject: Adding upstream version 10.1.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../docker/tests/integration/targets/connection_docker/runme.sh   | 8 ++++----
 .../tests/integration/targets/connection_docker_api/runme.sh      | 8 ++++----
 .../tests/integration/targets/docker_compose/tasks/main.yml       | 6 +++++-
 .../targets/setup_docker_compose_v1/vars/Archlinux.yml            | 2 ++
 4 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'ansible_collections/community/docker/tests')

diff --git a/ansible_collections/community/docker/tests/integration/targets/connection_docker/runme.sh b/ansible_collections/community/docker/tests/integration/targets/connection_docker/runme.sh
index 0965c5d72..4ebbf22e2 100755
--- a/ansible_collections/community/docker/tests/integration/targets/connection_docker/runme.sh
+++ b/ansible_collections/community/docker/tests/integration/targets/connection_docker/runme.sh
@@ -42,12 +42,12 @@ trap cleanup INT TERM EXIT
 echo "Start containers"
 for CONTAINER in ${DOCKER_CONTAINERS}; do
     if [ "${ANSIBLE_TEST_COVERAGE:-}" == "" ]; then
-        docker run --rm --name ${CONTAINER} --detach "${IMAGE}" /bin/sh -c 'sleep 10m'
+        docker run --rm --name "${CONTAINER}" --detach "${IMAGE}" /bin/sh -c 'sleep 10m'
     else
-        docker run --rm --name ${CONTAINER} --detach -v /tmp:/tmp "${IMAGE}" /bin/sh -c 'sleep 10m'
-        docker exec ${CONTAINER} pip3 install coverage
+        docker run --rm --name "${CONTAINER}" --detach -v /tmp:/tmp "${IMAGE}" /bin/sh -c 'sleep 10m'
+        docker exec "${CONTAINER}" pip3 install coverage
     fi
-    echo ${CONTAINER}
+    echo "${CONTAINER}"
 done
 
 cat > test_connection.inventory << EOF
diff --git a/ansible_collections/community/docker/tests/integration/targets/connection_docker_api/runme.sh b/ansible_collections/community/docker/tests/integration/targets/connection_docker_api/runme.sh
index 893b019ad..ea5588a6a 100755
--- a/ansible_collections/community/docker/tests/integration/targets/connection_docker_api/runme.sh
+++ b/ansible_collections/community/docker/tests/integration/targets/connection_docker_api/runme.sh
@@ -42,12 +42,12 @@ trap cleanup INT TERM EXIT
 echo "Start containers"
 for CONTAINER in ${DOCKER_CONTAINERS}; do
     if [ "${ANSIBLE_TEST_COVERAGE:-}" == "" ]; then
-        docker run --rm --name ${CONTAINER} --detach "${IMAGE}" /bin/sh -c 'sleep 10m'
+        docker run --rm --name "${CONTAINER}" --detach "${IMAGE}" /bin/sh -c 'sleep 10m'
     else
-        docker run --rm --name ${CONTAINER} --detach -v /tmp:/tmp "${IMAGE}" /bin/sh -c 'sleep 10m'
-        docker exec ${CONTAINER} pip3 install coverage
+        docker run --rm --name "${CONTAINER}" --detach -v /tmp:/tmp "${IMAGE}" /bin/sh -c 'sleep 10m'
+        docker exec "${CONTAINER}" pip3 install coverage
     fi
-    echo ${CONTAINER}
+    echo "${CONTAINER}"
 done
 
 cat > test_connection.inventory << EOF
diff --git a/ansible_collections/community/docker/tests/integration/targets/docker_compose/tasks/main.yml b/ansible_collections/community/docker/tests/integration/targets/docker_compose/tasks/main.yml
index 8ea59f865..34d518872 100644
--- a/ansible_collections/community/docker/tests/integration/targets/docker_compose/tasks/main.yml
+++ b/ansible_collections/community/docker/tests/integration/targets/docker_compose/tasks/main.yml
@@ -19,7 +19,11 @@
     msg: "Using container name prefix {{ cname_prefix }}"
 
 # Run the tests
-- block:
+- module_defaults:
+    community.docker.docker_compose:
+      api_version: '{{ omit if docker_api_version is version("1.45", "<") else "1.44" }}'
+
+  block:
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
diff --git a/ansible_collections/community/docker/tests/integration/targets/setup_docker_compose_v1/vars/Archlinux.yml b/ansible_collections/community/docker/tests/integration/targets/setup_docker_compose_v1/vars/Archlinux.yml
index f0698a3e4..bd619ad5b 100644
--- a/ansible_collections/community/docker/tests/integration/targets/setup_docker_compose_v1/vars/Archlinux.yml
+++ b/ansible_collections/community/docker/tests/integration/targets/setup_docker_compose_v1/vars/Archlinux.yml
@@ -7,3 +7,5 @@ docker_compose_pip_packages:
   - docker-compose
   # Force PyYAML to 5.3.1
   - PyYAML==5.3.1
+  # Force requests to < 2.32.0 (https://github.com/docker/docker-py/issues/3256)
+  - requests<2.32.0
-- 
cgit v1.2.3