Skip to content

Commit 84a3652

Browse files
committed
docker-runc: 1.1.2 -> 1.1.12
to address [CVE-2024-21626](https://nvd.nist.gov/vuln/detail/CVE-2024-21626)
1 parent 23cdc4b commit 84a3652

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkgs/applications/virtualization/docker/default.nix

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ rec {
1010
, containerdRev, containerdSha256
1111
, tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true
1212
# package dependencies
13-
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
13+
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage, buildGo119Module
1414
, makeWrapper, installShellFiles, pkg-config, glibc
1515
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
1616
, sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose
@@ -20,7 +20,7 @@ rec {
2020
, clientOnly ? !stdenv.isLinux, symlinkJoin
2121
}:
2222
let
23-
docker-runc = runc.overrideAttrs (oldAttrs: {
23+
docker-runc = (runc.overrideAttrs (oldAttrs: {
2424
pname = "docker-runc";
2525
inherit version;
2626

@@ -33,7 +33,9 @@ rec {
3333

3434
# docker/runc already include these patches / are not applicable
3535
patches = [];
36-
});
36+
})).override {
37+
buildGoModule = buildGo119Module;
38+
};
3739

3840
docker-containerd = containerd.overrideAttrs (oldAttrs: {
3941
pname = "docker-containerd";
@@ -247,8 +249,8 @@ rec {
247249
rev = "v${version}";
248250
sha256 = "sha256-c0A66JVvRPFNT/xCTIsW8k3a/EMIl73d/UlCohjmGMk=";
249251
};
250-
runcRev = "v1.1.4";
251-
runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA=";
252+
runcRev = "v1.1.12";
253+
runcSha256 = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
252254
containerdRev = "v1.6.8";
253255
containerdSha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8=";
254256
tiniRev = "v0.19.0";

0 commit comments

Comments
 (0)