alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #71386 from d-goldin/docker_runc_cve

Browse source 
docker-runc: switch to OCI runc 1.0.0-rc8+dev (security)
This commit is contained in:
Tim Steinbach 2019-10-21 12:14:41 -04:00 committed by GitHub
parent 45ffe82c43 b36ee87814
commit 2dc7d6197e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/virtualization/docker/default.nix
View file

@ -19,7 +19,7 @@ rec {
name = "docker-runc-${version}"; name = "docker-runc-${version}";
inherit version; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "opencontainers";
repo = "runc"; repo = "runc";
rev = runcRev; rev = runcRev;
sha256 = runcSha256; sha256 = runcSha256;
@ -198,14 +198,14 @@ rec {
}); });
# Get revisions from # 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 { docker_18_09 = makeOverridable dockerGen {
version = "18.09.9"; version = "18.09.9";
rev = "039a7df9ba8097dd987370782fcdd6ea79b26016"; rev = "039a7df9ba8097dd987370782fcdd6ea79b26016";
sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h";
runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657";
runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj";
containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
@ -216,8 +216,8 @@ rec {
version = "19.03.2"; version = "19.03.2";
rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"; rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e";
sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47"; sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47";
runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657";
runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj";
containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";