diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2018-01-30 14:06:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 14:06:19 +0000 |
| commit | 078fc69425787c9ceebfa003add3c1d80e49560c (patch) | |
| tree | 9d8b797b6389bd66b8df627470a60b5e817e345b /pkgs | |
| parent | f7bb9f67777b27b2e2fde6afd5012215293eaa26 (diff) | |
| parent | 438452f07a6df2b93e0e186cea51f059a54dd5cc (diff) | |
| download | nixlib-078fc69425787c9ceebfa003add3c1d80e49560c.tar nixlib-078fc69425787c9ceebfa003add3c1d80e49560c.tar.gz nixlib-078fc69425787c9ceebfa003add3c1d80e49560c.tar.bz2 nixlib-078fc69425787c9ceebfa003add3c1d80e49560c.tar.lz nixlib-078fc69425787c9ceebfa003add3c1d80e49560c.tar.xz nixlib-078fc69425787c9ceebfa003add3c1d80e49560c.tar.zst nixlib-078fc69425787c9ceebfa003add3c1d80e49560c.zip | |
Merge pull request #33746 from NeQuissimus/docker_18_01
docker-edge: 17.12.0 -> 18.01.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e5f5adff1d1d..56436d047f2e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -208,4 +208,16 @@ rec { tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; + + docker_18_01 = dockerGen rec { + version = "18.01.0-ce"; + rev = "03596f51b120095326d2004d676e97228a21014d"; # git commit + sha256 = "1zffaxwkfz8ca76f5ql5z76mcjx37jbgv2kk75i68487yg16x0md"; + runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; + runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; + containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; + containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6064c87a251e..d89ab305966f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14662,10 +14662,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_12; + docker_17_12 + docker_18_01; docker = docker_17_12; - docker-edge = docker_17_12; + docker-edge = docker_18_01; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; |