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

Merge pull request #33329 from NeQuissimus/docker_17_12

Browse Source 
docker: 17.{09,11} -> 17.12
This commit is contained in:
Tim Steinbach 2018-01-03 15:36:02 +00:00 committed by GitHub
commit bbb04db8fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,7 @@ rec {
cd ./components/engine cd ./components/engine
export AUTO_GOPATH=1 export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${rev}" export DOCKER_GITCOMMIT="${rev}"
export VERSION="${version}"
./hack/make.sh dynbinary ./hack/make.sh dynbinary
cd - cd -
'') + '' '') + ''
@ -136,11 +137,7 @@ rec {
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]); extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]);
installPhase = optionalString (stdenv.isLinux) '' installPhase = optionalString (stdenv.isLinux) ''
if [ -d "./components/engine/bundles/${version}" ]; then install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
else
install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
fi
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
--prefix PATH : "$out/libexec/docker:$extraPath" --prefix PATH : "$out/libexec/docker:$extraPath"
@ -207,26 +204,14 @@ rec {
# Get revisions from # Get revisions from
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
docker_17_09 = dockerGen rec { docker_17_12 = dockerGen rec {
version = "17.09.1-ce"; version = "17.12.0-ce";
rev = "19e2cf6259bd7f027a3fff180876a22945ce4ba8"; # git commit rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit
sha256 = "10glpbaw7bg2acgf1nmfn79is2b3xsm4shz67rp72dmpzzaavb42"; sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps";
runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f";
runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l";
containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; containerdRev = "89623f28b87a6004d4b785663257362d1658a729";
containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
docker_17_11 = dockerGen rec {
version = "17.11.0-ce";
rev = "1caf76ce6baa889133ece59fab3c36aaf143d4ef"; # git commit
sha256 = "09s7lxcs4wdjj69l7z3nybbms7iqspk1wy7qnr4r52s8vr3fd5s4";
runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d";
runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0";
containerdRev = "992280e8e265f491f7a624ab82f3e238be086e49";
containerdSha256 = "1ci6jlgrrgz4ph451035sl98lj2jd467pd4qnv85ma9gzblrxs7n";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
}; };

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

@ -14486,11 +14486,10 @@ with pkgs;
}; };
inherit (callPackage ../applications/virtualization/docker { }) inherit (callPackage ../applications/virtualization/docker { })
docker_17_09 docker_17_12;
docker_17_11;
docker = docker_17_09; docker = docker_17_12;
docker-edge = docker_17_11; docker-edge = docker_17_12;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };