Merge pull request #460 from konstruktoid/release

update to Docker 27.3.1 and Docker Compose 2.29.7
konstruktoid · Sep 21, 2024 · b86b333 · b86b333
2 parents 99a547c + d75a215
commit b86b333
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -48,15 +48,15 @@ docker_allow_ping: false
 docker_allow_privileged_ports: false
 docker_compose: false
 docker_compose_arch: x86_64
-docker_compose_release: v2.29.2
-docker_compose_release_shasum: d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4
+docker_compose_release: v2.29.7
+docker_compose_release_shasum: 383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0
 docker_compose_url: https://github.com/docker/compose/releases/download
 docker_daemon_json_template: daemon.json.j2
 docker_driver_network: slirp4netns
 docker_driver_port: builtin
-docker_release: 27.2.1
-docker_release_rootless_shasum: 5fc59413633656190be70c1dab32cdb514d4da914e8e72ef71da0eec86bae6a5
-docker_release_shasum: afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8
+docker_release: 27.3.1
+docker_release_rootless_shasum: 4e897d5838c1d9d89a7540f4558a3a0d1ef90cfc263c32b7346e8f58415ce4c3
+docker_release_shasum: 9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3
 docker_repository_template: docker.repo.j2
 docker_rootful_enabled: false
 docker_rootful: false

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,20 +1,20 @@
 ---
 # https://github.com/docker/roadmap/issues/188
-# https://download.docker.com/linux/static/stable/x86_64/{docker,docker-rootless-extras}-27.2.1.tgz
+# https://download.docker.com/linux/static/stable/x86_64/{docker,docker-rootless-extras}-27.3.1.tgz
 docker_add_alias: true
 docker_allow_ping: false
 docker_allow_privileged_ports: false
 docker_compose: false
 docker_compose_arch: x86_64
-docker_compose_release: v2.29.2
-docker_compose_release_shasum: d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4
+docker_compose_release: v2.29.7
+docker_compose_release_shasum: 383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0
 docker_compose_url: https://github.com/docker/compose/releases/download
 docker_daemon_json_template: daemon.json.j2
 docker_driver_network: slirp4netns
 docker_driver_port: builtin
-docker_release: 27.2.1
-docker_release_rootless_shasum: 5fc59413633656190be70c1dab32cdb514d4da914e8e72ef71da0eec86bae6a5
-docker_release_shasum: afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8
+docker_release: 27.3.1
+docker_release_rootless_shasum: 4e897d5838c1d9d89a7540f4558a3a0d1ef90cfc263c32b7346e8f58415ce4c3
+docker_release_shasum: 9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3
 docker_repository_template: docker.repo.j2
 docker_rootful_enabled: false
 docker_rootful: false

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -110,6 +110,7 @@ platforms:
     config_options:
       vm.boot_timeout: 600
       synced_folder: false
+      ssh.key_type: ed25519
     provider_raw_config_args:
       - customize ['modifyvm', :id, '--uart1', '0x3F8', '4']
       - customize ['modifyvm', :id, '--uartmode1', 'file', File::NULL]
@@ -122,6 +123,7 @@ platforms:
     config_options:
       vm.boot_timeout: 600
       synced_folder: false
+      ssh.key_type: ed25519
     provider_raw_config_args:
       - customize ['modifyvm', :id, '--uart1', '0x3F8', '4']
       - customize ['modifyvm', :id, '--uartmode1', 'file', File::NULL]

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -191,7 +191,6 @@
       ansible.builtin.lineinfile:
         path: /var/tmp/{{ docker_user }}-docker-compose.yml
         line: |
-          version: '3'
           services:
             web:
               image: nginx:latest
@@ -230,7 +229,6 @@
           ansible.builtin.command:
             cmd: docker compose -f "/var/tmp/{{ docker_user }}-docker-compose.yml" up -d
           changed_when: false
-          register: compose_output
 
         - name: Verify compose website
           ansible.builtin.uri:
@@ -258,15 +256,15 @@
               - requests<2.32 # https://github.com/ansible-community/molecule-plugins/issues/256
 
         - name: Create and start services
-          community.docker.docker_compose:
+          community.docker.docker_compose_v2:
             project_src: /var/tmp/
             files: "{{ docker_user }}-docker-compose.yml"
           register: compose_output
 
         - name: Verify that web service are running
           ansible.builtin.assert:
             that:
-              - compose_output.services.web.tmp_web_1.state.running
+              - not compose_output.failed
 
     - name: Container verification block
       environment: