From 1e589239b32c67881585d6d05d68aecc172c3485 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Apr 2017 14:51:33 -0400 Subject: [PATCH] docker-edge: init at 17.04 --- pkgs/applications/virtualization/docker/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 0fafb7fe317..6f3feddfda0 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -156,4 +156,16 @@ rec { tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; + + docker_17_04 = dockerGen rec { + version = "17.04.0-ce"; + rev = "4845c56"; # git commit + sha256 = "04farary19ws7xzsyack0sbrxjzp5xwjh26frxbpdd0a88pxnbj7"; + runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228"; + runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl"; + containerdRev = "422e31ce907fd9c3833a38d7b8fdd023e5a76e73"; + containerdSha256 = "1g0k82f1mk3vn57k130q776wp5c226d06qbiq1q148pqxxhym2r2"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67ca563cdac..6ed920fd6c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13201,9 +13201,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_03; + docker_17_03 + docker_17_04; docker = docker_17_03; + docker-edge = docker_17_04; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };