summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteutat3s <10206665+teutat3s@users.noreply.github.com>2024-07-26 09:40:39 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2024-07-26 20:57:43 +0200
commitb381163c0b6e97395d9750d7abc591d9f745112f (patch)
tree7a6fde5df39bb60403429d6cf62892823937df7e
parentMerge pull request #329015 from eclairevoyant/yt-dlp-cffi (diff)
downloadnixpkgs-b381163c0b6e97395d9750d7abc591d9f745112f.tar.gz
docker: move default from 24.x to 27.x
24.x is no longer maintained as of February 1, 2024[1]. It did not (yet?) receive a fix for CVE-2024-41110. [1] https://github.com/moby/moby/pull/46772#discussion_r1686464084
-rw-r--r--nixos/doc/manual/release-notes/rl-2411.section.md2
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 6dd1fb04d3a7..17f17f500f2c 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -227,6 +227,8 @@
Explicitly set `kubelet.hostname` to `networking.fqdnOrHostName` to get back
the old default behavior.
+- Docker now defaults to 27.x, because version 24.x stopped receiving security updates and bug fixes after [February 1, 2024](https://github.com/moby/moby/pull/46772#discussion_r1686464084).
+
- `keycloak` was updated to version 25, which introduces new hostname related options.
See [Upgrading Guide](https://www.keycloak.org/docs/25.0.1/upgrading/#migrating-to-25-0-0) for instructions.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d419ef217aa..70d65a0d84ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29895,7 +29895,7 @@ with pkgs;
inherit (callPackage ../applications/virtualization/docker {})
docker_24 docker_25 docker_26 docker_27;
- docker = docker_24;
+ docker = docker_27;
docker-client = docker.override { clientOnly = true; };
docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };