dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #330109 from teutat3s/default-docker-27

Browse Source 
docker: move default from 24.x to 27.x, docker_24 mark as vulnerable, docker_{25,26}: bump
This commit is contained in:
Sandro 2024-07-29 13:48:20 +02:00 committed by GitHub
commit f22c61e419
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -231,6 +231,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.

28
pkgs/applications/virtualization/docker/default.nix
View File

@ -21,6 +21,7 @@ rec {
, withBtrfs ? stdenv.isLinux, btrfs-progs
, withLvm ? stdenv.isLinux, lvm2
, withSeccomp ? stdenv.isLinux, libseccomp
, knownVulnerabilities ? []
}:
let
docker-runc = runc.overrideAttrs {
@ -267,6 +268,7 @@ rec {
license = licenses.asl20;
maintainers = with maintainers; [ offline vdemeester periklis teutat3s ];
mainProgram = "docker";
inherit knownVulnerabilities;
};
});
@ -284,32 +286,38 @@ rec {
containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk=";
tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
knownVulnerabilities = [
"CVE-2024-23651"
"CVE-2024-23652"
"CVE-2024-23653"
"CVE-2024-41110"
];
};
docker_25 = callPackage dockerGen rec {
version = "25.0.5";
cliRev = "v${version}";
version = "25.0.6";
cliRev = "v25.0.5";
cliHash = "sha256-CACMi3bXUN6oGc2f/Z+lNQqMgQ4llRWPRKgijdpiPGg=";
mobyRev = "v${version}";
mobyHash = "sha256-4QGz22fXxyAD77pyUWb2lF3VKqxmPIrGqcJGoyrEHew=";
mobyHash = "sha256-+zkhUMeVD3HNq8WrWQmLskq+HykvD5kzSACmf67YbJE=";
runcRev = "v1.1.12";
runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
containerdRev = "v1.7.13";
containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk=";
containerdRev = "v1.7.20";
containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY=";
tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};
docker_26 = callPackage dockerGen rec {
version = "26.1.4";
version = "26.1.5";
cliRev = "v${version}";
cliHash = "sha256-7yCR49Un1i1kB+66IKt/8lgwKNkUjtVh52DH9OY8Pw4=";
cliHash = "sha256-UlN+Uc0YHhLyu14h5oDBXP4K9y2tYKPOIPTGZCe4PVY=";
mobyRev = "v${version}";
mobyHash = "sha256-0WwlpUECvmNq6DBm7U7rjzYfGKF7pxsfs9+x5uVPV0k=";
mobyHash = "sha256-6Hx7GnA7P6HqDlnGoc+HpPHSl69XezwAEGbvWYUVQlE=";
runcRev = "v1.1.12";
runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
containerdRev = "v1.7.15";
containerdHash = "sha256-qLrPLGxsUmgEscrhyl+1rJ0k7c9ibKnpMpsJPD4xDZU=";
containerdRev = "v1.7.18";
containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ=";
tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};

2
pkgs/top-level/all-packages.nix
View File

@ -29849,7 +29849,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 { };