Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 45ffe82c43cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2dc7d6197ec0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 19, 2019

  1. docker-runc: switch to OCI runc 1.0.0-rc8+dev 

    The revision picked is based on
https://github.com/docker/docker-ce/blob/19.03/components/engine/hack/dockerfile/install/runc.installer
and https://github.com/docker/docker-ce/blob/18.09/components/engine/hack/dockerfile/install/runc.installer

This should address CVE-2019-16884.
    @d-goldin
    d-goldin committed Oct 19, 2019
    Copy the full SHA
    b36ee87 View commit details

Commits on Oct 21, 2019

  1. Merge pull request #71386 from d-goldin/docker_runc_cve 

    docker-runc: switch to OCI runc 1.0.0-rc8+dev (security)
    @NeQuissimus
    NeQuissimus authored Oct 21, 2019
    Copy the full SHA
    2dc7d61 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/applications/virtualization/docker/default.nix
12 changes: 6 additions & 6 deletions pkgs/applications/virtualization/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";