public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker-edge: 18.03 -> 18.04

This commit is contained in:
Tim Steinbach 2018-04-10 18:28:20 -04:00
parent 7decb0805e
commit d76725f3a5
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,4 +208,16 @@ rec {
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
}; };
docker_18_04 = dockerGen rec {
version = "18.04.0-ce";
rev = "3d479c0af67cb9ea43a9cfc1bf2ef097e06a3470"; # git commit
sha256 = "1askbk8b92cdv7vlm688g2f1v2xjhmx77578318x76dydfql3jfl";
runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88";
containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
} }

5
pkgs/top-level/all-packages.nix
View File

@ -15243,10 +15243,11 @@ with pkgs;
# go 1.9 pin until https://github.com/moby/moby/pull/35739 # go 1.9 pin until https://github.com/moby/moby/pull/35739
inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
docker_18_03; docker_18_03
docker_18_04;
docker = docker_18_03; docker = docker_18_03;
docker-edge = docker_18_03; docker-edge = docker_18_04;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };