Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to Docker 27.3.1 and Docker Compose 2.29.7 #460

Merged
merged 4 commits into from
Sep 21, 2024
Merged

update to Docker 27.3.1 and Docker Compose 2.29.7 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c77950d
update to Docker 27.3.0 and Docker Compose 2.29.7
konstruktoid Sep 20, 2024
495ad67
update to Docker 27.3.1
konstruktoid Sep 21, 2024
0f13aa1
set ssh key type for noble
konstruktoid Sep 21, 2024
d75a215
update docker compose testing
konstruktoid Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions molecule/default/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down
6 changes: 2 additions & 4 deletions molecule/default/verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@
ansible.builtin.lineinfile:
path: /var/tmp/{{ docker_user }}-docker-compose.yml
line: |
version: '3'
services:
web:
image: nginx:latest
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading