Merge pull request #31899 from NeQuissimus/docker_17_11

docker-edge: 17.10 -> 17.11

authored by Tim Steinbach and committed by GitHub 44f1d458 843ee55b

+14 -9
+12 -7
pkgs/applications/virtualization/docker/default.nix
··· 36 sha256 = containerdSha256; 37 }; 38 39 # This should go into the containerd derivation once 1.0.0 is out 40 preBuild = '' 41 mkdir $(pwd)/vendor/src 42 mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ 43 '' + oldAttrs.preBuild; ··· 90 buildInputs = [ 91 makeWrapper removeReferencesTo go-md2man go libtool 92 ] ++ optionals (stdenv.isLinux) [ 93 - sqlite devicemapper btrfs-progs systemd libtool libseccomp 94 ]; 95 96 dontStrip = true; ··· 214 tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 215 }; 216 217 - docker_17_10 = dockerGen rec { 218 - version = "17.10.0-ce"; 219 - rev = "f4ffd2511ce93aa9e5eefdf0e912f77543080b0b"; # git commit 220 - sha256 = "07x47cfdaz4lhlga1pchcbqqy0nd2q6zch0ycag18vzi99w4gmh2"; 221 runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d"; 222 runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0"; 223 - containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; 224 - containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; 225 tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; 226 tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 227 };
··· 36 sha256 = containerdSha256; 37 }; 38 39 + hardeningDisable = [ "fortify" ]; 40 + 41 + buildInputs = [ removeReferencesTo go btrfs-progs ]; 42 + 43 # This should go into the containerd derivation once 1.0.0 is out 44 preBuild = '' 45 + export GOPATH=$(pwd)/vendor 46 mkdir $(pwd)/vendor/src 47 mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ 48 '' + oldAttrs.preBuild; ··· 95 buildInputs = [ 96 makeWrapper removeReferencesTo go-md2man go libtool 97 ] ++ optionals (stdenv.isLinux) [ 98 + sqlite devicemapper btrfs-progs systemd libseccomp 99 ]; 100 101 dontStrip = true; ··· 219 tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 220 }; 221 222 + docker_17_11 = dockerGen rec { 223 + version = "17.11.0-ce"; 224 + rev = "1caf76ce6baa889133ece59fab3c36aaf143d4ef"; # git commit 225 + sha256 = "09s7lxcs4wdjj69l7z3nybbms7iqspk1wy7qnr4r52s8vr3fd5s4"; 226 runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d"; 227 runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0"; 228 + containerdRev = "992280e8e265f491f7a624ab82f3e238be086e49"; 229 + containerdSha256 = "1ci6jlgrrgz4ph451035sl98lj2jd467pd4qnv85ma9gzblrxs7n"; 230 tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; 231 tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 232 };
+2 -2
pkgs/top-level/all-packages.nix
··· 14245 14246 inherit (callPackage ../applications/virtualization/docker { }) 14247 docker_17_09 14248 - docker_17_10; 14249 14250 docker = docker_17_09; 14251 - docker-edge = docker_17_10; 14252 14253 docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; 14254
··· 14245 14246 inherit (callPackage ../applications/virtualization/docker { }) 14247 docker_17_09 14248 + docker_17_11; 14249 14250 docker = docker_17_09; 14251 + docker-edge = docker_17_11; 14252 14253 docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; 14254