Skip to content

Commit

Permalink
Merge pull request #384 from konstruktoid/drel
Browse files Browse the repository at this point in the history
update Docker to 26.1.4
  • Loading branch information
konstruktoid authored Jun 11, 2024
2 parents f2d922b + d2b6012 commit 11820a7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ docker_compose_release: v2.27.0
docker_compose_release_shasum: f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0
docker_compose_url: https://github.com/docker/compose/releases/download
docker_daemon_json_template: daemon.json.j2
docker_release: 26.1.3
docker_release_rootless_shasum: 864852d0210582ef6618f8f3a1de786c31ec53581541769b0db05d71ebfda97b
docker_release_shasum: a50076d372d3bbe955664707af1a4ce4f5df6b2d896e68b12ecc74e724d1db31
docker_release: 26.1.4
docker_release_rootless_shasum: 19a84b917fe6677db4438456e98933aef992fd3b2c949dfa7638d055cfaa5e81
docker_release_shasum: a9cede81aa3337f310132c2c920dba2edc8d29b7d97065b63ba41cf47ae1ca4f
docker_repository_template: docker.repo.j2
docker_rootful_enabled: false
docker_rootful: false
Expand Down
8 changes: 4 additions & 4 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# https://github.com/docker/roadmap/issues/188
# https://download.docker.com/linux/static/stable/x86_64/{docker,docker-rootless-extras}-26.1.3.tgz
# https://download.docker.com/linux/static/stable/x86_64/{docker,docker-rootless-extras}-26.1.4.tgz
docker_add_alias: true
docker_allow_ping: false
docker_allow_privileged_ports: false
Expand All @@ -9,9 +9,9 @@ docker_compose_release: v2.27.0
docker_compose_release_shasum: f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0
docker_compose_url: https://github.com/docker/compose/releases/download
docker_daemon_json_template: daemon.json.j2
docker_release: 26.1.3
docker_release_rootless_shasum: 864852d0210582ef6618f8f3a1de786c31ec53581541769b0db05d71ebfda97b
docker_release_shasum: a50076d372d3bbe955664707af1a4ce4f5df6b2d896e68b12ecc74e724d1db31
docker_release: 26.1.4
docker_release_rootless_shasum: 19a84b917fe6677db4438456e98933aef992fd3b2c949dfa7638d055cfaa5e81
docker_release_shasum: a9cede81aa3337f310132c2c920dba2edc8d29b7d97065b63ba41cf47ae1ca4f
docker_repository_template: docker.repo.j2
docker_rootful_enabled: false
docker_rootful: false
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ requires =
tox>=4.0.2
envlist =
devel
py310-ansible{8,9,devel}
py311-ansible{8,9,devel}
py310-ansible{8,9,10,devel}
py311-ansible{8,9,10,devel}
py312-ansible{8,9,10,devel}
skipsdist = true

[testenv:devel]
Expand All @@ -26,6 +27,7 @@ passenv = *
deps =
ansible8: ansible==8
ansible9: ansible==9
ansible10: ansible==10
ansibledevel: https://github.com/ansible/ansible/archive/devel.tar.gz
ansible-lint
docker
Expand Down

0 comments on commit 11820a7

Please sign in to comment.