Skip to content

Commit b86b333

Browse files
authored
Merge pull request #460 from konstruktoid/release
update to Docker 27.3.1 and Docker Compose 2.29.7
2 parents 99a547c + d75a215 commit b86b333

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ docker_allow_ping: false
4848
docker_allow_privileged_ports: false
4949
docker_compose: false
5050
docker_compose_arch: x86_64
51-
docker_compose_release: v2.29.2
52-
docker_compose_release_shasum: d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4
51+
docker_compose_release: v2.29.7
52+
docker_compose_release_shasum: 383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0
5353
docker_compose_url: https://github.com/docker/compose/releases/download
5454
docker_daemon_json_template: daemon.json.j2
5555
docker_driver_network: slirp4netns
5656
docker_driver_port: builtin
57-
docker_release: 27.2.1
58-
docker_release_rootless_shasum: 5fc59413633656190be70c1dab32cdb514d4da914e8e72ef71da0eec86bae6a5
59-
docker_release_shasum: afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8
57+
docker_release: 27.3.1
58+
docker_release_rootless_shasum: 4e897d5838c1d9d89a7540f4558a3a0d1ef90cfc263c32b7346e8f58415ce4c3
59+
docker_release_shasum: 9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3
6060
docker_repository_template: docker.repo.j2
6161
docker_rootful_enabled: false
6262
docker_rootful: false

defaults/main.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22
# https://github.com/docker/roadmap/issues/188
3-
# https://download.docker.com/linux/static/stable/x86_64/{docker,docker-rootless-extras}-27.2.1.tgz
3+
# https://download.docker.com/linux/static/stable/x86_64/{docker,docker-rootless-extras}-27.3.1.tgz
44
docker_add_alias: true
55
docker_allow_ping: false
66
docker_allow_privileged_ports: false
77
docker_compose: false
88
docker_compose_arch: x86_64
9-
docker_compose_release: v2.29.2
10-
docker_compose_release_shasum: d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4
9+
docker_compose_release: v2.29.7
10+
docker_compose_release_shasum: 383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0
1111
docker_compose_url: https://github.com/docker/compose/releases/download
1212
docker_daemon_json_template: daemon.json.j2
1313
docker_driver_network: slirp4netns
1414
docker_driver_port: builtin
15-
docker_release: 27.2.1
16-
docker_release_rootless_shasum: 5fc59413633656190be70c1dab32cdb514d4da914e8e72ef71da0eec86bae6a5
17-
docker_release_shasum: afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8
15+
docker_release: 27.3.1
16+
docker_release_rootless_shasum: 4e897d5838c1d9d89a7540f4558a3a0d1ef90cfc263c32b7346e8f58415ce4c3
17+
docker_release_shasum: 9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3
1818
docker_repository_template: docker.repo.j2
1919
docker_rootful_enabled: false
2020
docker_rootful: false

molecule/default/molecule.yml

+2
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ platforms:
110110
config_options:
111111
vm.boot_timeout: 600
112112
synced_folder: false
113+
ssh.key_type: ed25519
113114
provider_raw_config_args:
114115
- customize ['modifyvm', :id, '--uart1', '0x3F8', '4']
115116
- customize ['modifyvm', :id, '--uartmode1', 'file', File::NULL]
@@ -122,6 +123,7 @@ platforms:
122123
config_options:
123124
vm.boot_timeout: 600
124125
synced_folder: false
126+
ssh.key_type: ed25519
125127
provider_raw_config_args:
126128
- customize ['modifyvm', :id, '--uart1', '0x3F8', '4']
127129
- customize ['modifyvm', :id, '--uartmode1', 'file', File::NULL]

molecule/default/verify.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@
191191
ansible.builtin.lineinfile:
192192
path: /var/tmp/{{ docker_user }}-docker-compose.yml
193193
line: |
194-
version: '3'
195194
services:
196195
web:
197196
image: nginx:latest
@@ -230,7 +229,6 @@
230229
ansible.builtin.command:
231230
cmd: docker compose -f "/var/tmp/{{ docker_user }}-docker-compose.yml" up -d
232231
changed_when: false
233-
register: compose_output
234232

235233
- name: Verify compose website
236234
ansible.builtin.uri:
@@ -258,15 +256,15 @@
258256
- requests<2.32 # https://github.com/ansible-community/molecule-plugins/issues/256
259257

260258
- name: Create and start services
261-
community.docker.docker_compose:
259+
community.docker.docker_compose_v2:
262260
project_src: /var/tmp/
263261
files: "{{ docker_user }}-docker-compose.yml"
264262
register: compose_output
265263

266264
- name: Verify that web service are running
267265
ansible.builtin.assert:
268266
that:
269-
- compose_output.services.web.tmp_web_1.state.running
267+
- not compose_output.failed
270268

271269
- name: Container verification block
272270
environment:

0 commit comments

Comments
 (0)