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

docker: 17.03.0 -> 17.03.1

This commit is contained in:
Tim Steinbach 2017-04-04 08:03:55 -04:00
parent bb1e6557da
commit aefb9671bf
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
2 changed files with 134 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,19 +6,26 @@
}:
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md
# https://github.com/docker/docker/blob/TAG/hack/dockerfile/binaries-commits
with lib;
stdenv.mkDerivation rec {
rec {
dockerGen = {
version, rev, sha256
, runcRev, runcSha256
, containerdRev, containerdSha256
, tiniRev, tiniSha256
} : stdenv.mkDerivation rec {
inherit version rev;
name = "docker-${version}";
version = "17.03.0-ce";
rev = "60ccb22"; # should match the version commit
src = fetchFromGitHub {
owner = "docker";
repo = "docker";
rev = "v${version}";
sha256 = "0ml9aan8x4w8kfz7dm9vvl8b1a0vq09si9b7z50xz84040cjhnr9";
sha256 = sha256;
};
docker-runc = runc.overrideAttrs (oldAttrs: rec {
@ -26,8 +33,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "docker";
repo = "runc";
rev = "a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70";
sha256 = "0n7vr47fhpyxx5vdnp453qp4cq50w4hwgq3ldyj5878d91iir7l1";
rev = runcRev;
sha256 = runcSha256;
};
# docker/runc already include these patches / are not applicable
patches = [];
@ -37,8 +44,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "docker";
repo = "containerd";
rev = "977c511eda0925a723debdc94d09459af49d082a";
sha256 = "0hmcj8i70vv3a3bbdawrgi84a442m09x5mpc7fgn8dd3v031lcbc";
rev = containerdRev;
sha256 = containerdSha256;
};
});
docker-tini = tini.overrideAttrs (oldAttrs: rec {
@ -46,8 +53,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "krallin";
repo = "tini";
rev = "949e6facb77383876aeff8a6944dde66b3089574";
sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
rev = tiniRev;
sha256 = tiniSha256;
};
# Do not remove static from make files as we want a static binary
@ -136,4 +143,17 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ offline tailhook ];
platforms = platforms.linux;
};
};
docker_17_03 = dockerGen rec {
version = "17.03.1-ce";
rev = "c6d412e"; # git commit
sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7";
runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe";
runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m";
containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc";
containerdSha256 = "06f2gsx4w9z4wwjhrpafmz6c829wi8p7crj6sya6x9ii50bkn8p6";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
}

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

@ -13198,7 +13198,11 @@ with pkgs;
dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
};
docker = callPackage ../applications/virtualization/docker { };
inherit (callPackage ../applications/virtualization/docker { })
docker_17_03;
docker = docker_17_03;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };