mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Code Issues Wiki Activity

Merge pull request #37713 from NeQuissimus/docker_18_03

Browse source 
docker: 18.02 -> 18.03
This commit is contained in:
Tim Steinbach 2018-03-24 12:32:38 -04:00 committed by GitHub
parent 204a029101 b072dcffae
commit 62b3507711
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/applications/virtualization/docker/default.nix
View file

@ -195,28 +195,16 @@ rec {
});
# Get revisions from
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
# https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
docker_17_12 = dockerGen rec {
version = "17.12.1-ce";
rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit
sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i";
runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
docker_18_02 = dockerGen rec {
version = "18.02.0-ce";
rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit
sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m";
runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
docker_18_03 = dockerGen rec {
version = "18.03.0-ce";
rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit
sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g";
runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c";
containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};

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

@ -15131,11 +15131,10 @@ with pkgs;
# go 1.9 pin until https://github.com/moby/moby/pull/35739
inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
docker_17_12
docker_18_02;
docker_18_03;
docker = docker_17_12;
docker-edge = docker_18_02;
docker = docker_18_03;
docker-edge = docker_18_03;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };