From d2b60123bc95f772a7db0da9b66b2abd601522de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Tue, 11 Jun 2024 15:40:46 +0000 Subject: [PATCH] update Docker to 26.1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- README.md | 6 +++--- defaults/main.yml | 8 ++++---- tox.ini | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ac8f9c7..d9d8fb7 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/defaults/main.yml b/defaults/main.yml index dde576a..a478a04 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 @@ -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 diff --git a/tox.ini b/tox.ini index 19affdb..5834588 100644 --- a/tox.ini +++ b/tox.ini @@ -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] @@ -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