From 693d2403f1bf37e2cb4fe45cb949a64344965c18 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Aug 2017 15:37:36 -0400 Subject: [PATCH] docker-edge: 17.06 -> 17.07 --- .../virtualization/docker/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e1935f39092..edae12fed1f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -169,6 +169,9 @@ rec { }; }; + # Get revisions from + # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits + docker_17_06 = dockerGen rec { version = "17.06.1-ce"; rev = "874a7374f31c77aca693d025101b2de1b20b96c2"; # git commit @@ -180,4 +183,16 @@ rec { tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; 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"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89afebcf4bb..a6692f277c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13815,10 +13815,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_06; + docker_17_06 + docker_17_07; docker = docker_17_06; - docker-edge = docker_17_06; + docker-edge = docker_17_07; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };