diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-07-29 13:48:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-29 13:48:20 +0200 |
| commit | f22c61e419c60729f65810396225314489e3e3cf (patch) | |
| tree | 84b2271c98fcfd5dc0c3152ef5d905f71d7688ea /pkgs/applications/virtualization/docker | |
| parent | 2f02e680e4eec794c1047f2f90185a0984a96da2 (diff) | |
| parent | e2963b7913f7c4c6c75d50518d8f20c91dd91646 (diff) | |
Merge pull request #330109 from teutat3s/default-docker-27
docker: move default from 24.x to 27.x, docker_24 mark as vulnerable, docker_{25,26}: bump
Diffstat (limited to 'pkgs/applications/virtualization/docker')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 946544a02a95..b77d419e186f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -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="; }; |