diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2019-10-21 12:14:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-21 12:14:41 -0400 |
| commit | 2dc7d6197ec0185b5d5eff065af3e99b3478b0f7 (patch) | |
| tree | 3429e425444e8d52a92b8657b8d02a88dda0183b | |
| parent | 45ffe82c43cb69a57622935220bb0950dade7934 (diff) | |
| parent | b36ee87814496158d11471fd904e4b51e54c5087 (diff) | |
| download | nixpkgs-2dc7d6197ec0185b5d5eff065af3e99b3478b0f7.tar nixpkgs-2dc7d6197ec0185b5d5eff065af3e99b3478b0f7.tar.gz nixpkgs-2dc7d6197ec0185b5d5eff065af3e99b3478b0f7.tar.bz2 nixpkgs-2dc7d6197ec0185b5d5eff065af3e99b3478b0f7.tar.lz nixpkgs-2dc7d6197ec0185b5d5eff065af3e99b3478b0f7.tar.xz nixpkgs-2dc7d6197ec0185b5d5eff065af3e99b3478b0f7.tar.zst nixpkgs-2dc7d6197ec0185b5d5eff065af3e99b3478b0f7.zip | |
Merge pull request #71386 from d-goldin/docker_runc_cve
docker-runc: switch to OCI runc 1.0.0-rc8+dev (security)
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 027404439cd..9902ae2140c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -19,7 +19,7 @@ rec { name = "docker-runc-${version}"; inherit version; src = fetchFromGitHub { - owner = "docker"; + owner = "opencontainers"; repo = "runc"; rev = runcRev; sha256 = runcSha256; @@ -198,14 +198,14 @@ rec { }); # Get revisions from - # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* + # https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/* docker_18_09 = makeOverridable dockerGen { version = "18.09.9"; rev = "039a7df9ba8097dd987370782fcdd6ea79b26016"; sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; - runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; - runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; + runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; @@ -216,8 +216,8 @@ rec { version = "19.03.2"; rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"; sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47"; - runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; - runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; + runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; |