diff options
author | Tim Steinbach <tim@nequissimus.com> | 2017-09-27 08:16:42 -0400 |
---|---|---|
committer | Tim Steinbach <tim@nequissimus.com> | 2017-09-27 08:18:40 -0400 |
commit | 825e417457d803fbc5e7ae8bc19fa9dfc29c32c4 (patch) | |
tree | 1b528798c22324047ae57c8f5033f154f6490d44 /pkgs/applications/virtualization/docker | |
parent | 0bc5d15aee116b0aa548b0f48890941bc9f7c655 (diff) | |
download | nixlib-825e417457d803fbc5e7ae8bc19fa9dfc29c32c4.tar nixlib-825e417457d803fbc5e7ae8bc19fa9dfc29c32c4.tar.gz nixlib-825e417457d803fbc5e7ae8bc19fa9dfc29c32c4.tar.bz2 nixlib-825e417457d803fbc5e7ae8bc19fa9dfc29c32c4.tar.lz nixlib-825e417457d803fbc5e7ae8bc19fa9dfc29c32c4.tar.xz nixlib-825e417457d803fbc5e7ae8bc19fa9dfc29c32c4.tar.zst nixlib-825e417457d803fbc5e7ae8bc19fa9dfc29c32c4.zip |
docker: add 17.09.0-ce
Diffstat (limited to 'pkgs/applications/virtualization/docker')
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 043f27e13d24..f28ec6275b86 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -44,6 +44,13 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; + + # This should go into the containerd derivation once 1.0.0 is out + preBuild = '' + mkdir $(pwd)/vendor/src + mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ + ln -s $(pwd) vendor/src/github.com/containerd/containerd + ''; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init"; @@ -188,14 +195,14 @@ rec { tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_17_07 = dockerGen rec { - version = "17.07.0-ce"; - rev = "87847530f7176a48348d196f7c23bbd058052af1"; # git commit - sha256 = "0zw9zlzbd7il33ch17ypwpa73gsb930sf2njnphg7ylvnqp8qzsp"; - runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4"; - runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq"; - containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429"; - containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j"; + docker_17_09 = dockerGen rec { + version = "17.09.0-ce"; + rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit + sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p"; + runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; + runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; + containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; + containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; |