Skip to content

Commit

Permalink
Merge pull request #329 from konstruktoid/dorel
Browse files Browse the repository at this point in the history
bump Docker to 26.0.1
  • Loading branch information
konstruktoid authored Apr 12, 2024
2 parents d5950bc + 2d2dfce commit f13b5c2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 27 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: false
docker_compose_release: 2.26.0
docker_compose_release_shasum: 59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16
docker_daemon_json_template: daemon.json.j2
docker_release: 26.0.0
docker_release_rootless_shasum: 2303fb96aaa9b70882b893b5f260ff5beaf1bdeb535d2371e50dfd75058ada4a
docker_release_shasum: d69e8eedc72d6d219933ab53b8e7f2dbd9e64695d5db68a2df17333db433c456
docker_release: 26.0.1
docker_release_rootless_shasum: 1f0b3391dadc5121bd7754d88582fd572a62acac449761de049d0a1d10ecbf4e
docker_release_shasum: d362e648f6a7cccbe313145864d2316ab3114abb22c15a685427ebd5cb306078
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,16 +1,16 @@
---
# https://github.com/docker/roadmap/issues/188
# https://download.docker.com/linux/static/stable/x86_64/{docker,docker-rootless-extras}-26.0.0.tgz
# https://download.docker.com/linux/static/stable/x86_64/{docker,docker-rootless-extras}-26.0.1.tgz
docker_add_alias: true
docker_allow_ping: false
docker_allow_privileged_ports: false
docker_compose: false
docker_compose_release: 2.26.0
docker_compose_release_shasum: 59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16
docker_daemon_json_template: daemon.json.j2
docker_release: 26.0.0
docker_release_rootless_shasum: 2303fb96aaa9b70882b893b5f260ff5beaf1bdeb535d2371e50dfd75058ada4a
docker_release_shasum: d69e8eedc72d6d219933ab53b8e7f2dbd9e64695d5db68a2df17333db433c456
docker_release: 26.0.1
docker_release_rootless_shasum: 1f0b3391dadc5121bd7754d88582fd572a62acac449761de049d0a1d10ecbf4e
docker_release_shasum: d362e648f6a7cccbe313145864d2316ab3114abb22c15a685427ebd5cb306078
docker_repository_template: docker.repo.j2
docker_rootful_enabled: false
docker_rootful: false
Expand Down
20 changes: 0 additions & 20 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,6 @@ provisioner:
docker_user: jammyuser
docker_user_bashrc: true
docker_compose: true
lunar:
docker_add_alias: false
docker_allow_ping: false
docker_allow_privileged_ports: false
docker_rootful: false
docker_rootful_enabled: false
docker_user: lunaruser
docker_user_bashrc: true
docker_compose: true
platforms:
- name: bookworm
box: debian/bookworm64
Expand Down Expand Up @@ -145,17 +136,6 @@ platforms:
instance_raw_config_args:
- "vbguest.installer_options = { allow_kernel_upgrade: true }"
memory: 1024
- name: lunar
box: ubuntu/lunar64
config_options:
vm.boot_timeout: 600
synced_folder: false
provider_raw_config_args:
- customize ['modifyvm', :id, '--uart1', '0x3F8', '4']
- customize ['modifyvm', :id, '--uartmode1', 'file', File::NULL]
instance_raw_config_args:
- "vbguest.installer_options = { allow_kernel_upgrade: true }"
memory: 1024
verifier:
name: ansible
scenario:
Expand Down

0 comments on commit f13b5c2

Please sign in to comment.