diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2017-05-09 10:11:05 +0200 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2017-05-09 10:11:05 +0200 |
| commit | 398f6ed7d3b385cf11d95f4d83f5012300112444 (patch) | |
| tree | 82cd01abc865478e29a930db23bda3e5f4240cc5 /pkgs/applications/virtualization/docker | |
| parent | 63841d159e5f2e20c56948df84b004a03f236c47 (diff) | |
| download | nixlib-398f6ed7d3b385cf11d95f4d83f5012300112444.tar nixlib-398f6ed7d3b385cf11d95f4d83f5012300112444.tar.gz nixlib-398f6ed7d3b385cf11d95f4d83f5012300112444.tar.bz2 nixlib-398f6ed7d3b385cf11d95f4d83f5012300112444.tar.lz nixlib-398f6ed7d3b385cf11d95f4d83f5012300112444.tar.xz nixlib-398f6ed7d3b385cf11d95f4d83f5012300112444.tar.zst nixlib-398f6ed7d3b385cf11d95f4d83f5012300112444.zip | |
docker-edge: 17.04 to 17.05
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'pkgs/applications/virtualization/docker')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/docker/proxy.nix | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6f3feddfda0b..ffab4303c4aa 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -157,14 +157,14 @@ rec { tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_17_04 = dockerGen rec { - version = "17.04.0-ce"; - rev = "4845c56"; # git commit - sha256 = "04farary19ws7xzsyack0sbrxjzp5xwjh26frxbpdd0a88pxnbj7"; + docker_17_05 = dockerGen rec { + version = "17.05.0-ce"; + rev = "90d35abf7b3535c1c319c872900fbd76374e521c"; # git commit + sha256 = "1m4fcawjj14qws57813wjxjwgnrfxgxnnzlj61csklp0s9dhg7df"; runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228"; runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl"; - containerdRev = "422e31ce907fd9c3833a38d7b8fdd023e5a76e73"; - containerdSha256 = "1g0k82f1mk3vn57k130q776wp5c226d06qbiq1q148pqxxhym2r2"; + containerdRev = "9048e5e50717ea4497b757314bad98ea3763c145"; + containerdSha256 = "1r9xhvzzh7md08nqb0rbp5d1rdr7jylb3da954d0267i0kh2iksa"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index a9f278c4d2a8..52005c4a2733 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { name = "docker-proxy-${rev}"; - rev = "0f534354b813003a754606689722fe253101bc4e"; + rev = "7b2b1feb1de4817d522cc372af149ff48d25028e"; src = fetchFromGitHub { inherit rev; owner = "docker"; repo = "libnetwork"; - sha256 = "1ah7h417llcq0xzdbp497pchb9m9qvjhrwajcjb0ybrs8v889m31"; + sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935"; }; buildInputs = [ go ]; |