Merge pull request #235 from konstruktoid/c2230

update to Docker Compose 2.23.0
konstruktoid · Oct 19, 2023 · f8e1d23 · f8e1d23
2 parents ce1d1ed + 4032f3a
commit f8e1d23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -8,8 +8,8 @@ docker_allow_privileged_ports: false
 docker_bash_completion_shasum: cd9c70120bc5f7e6772b6a5350abf63099004c357814abc8a8a3689a7f2e3df0
 docker_compose_bash_completion_shasum: 9926c945b466fad570ad574089d6a90f7d9ba452a2d6a8ba67611a664707f0de
 docker_compose: false
-docker_compose_release: 2.22.0
-docker_compose_release_shasum: e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a
+docker_compose_release: 2.23.0
+docker_compose_release_shasum: 6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4
 docker_daemon_json_template: daemon.json.j2
 docker_release: 24.0.6
 docker_release_rootless_shasum: 4282750458fcae75351a95bbcf7762fb117035fd0ee2663dfc3ad8280627984c

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -169,7 +169,7 @@
             cmd: docker compose version
           register: docker_compose_plugin
           changed_when: false
-          failed_when: docker_compose_plugin.rc != 0
+          failed_when: docker_compose_plugin.rc != 0 and (not docker_compose_release in docker_compose_plugin.stdout)
           when: docker_compose
 
     - name: Container verification block
@@ -304,7 +304,6 @@
               - docker_user_info.uid|string in nginx_container_restarted.container.NetworkSettings.SandboxKey
               - docker_user_info.home in nginx_container_restarted.container.HostnamePath
 
-
         - name: Verify rootless port 80 nginx container
           become: true
           become_user: "{{ docker_user }}"