summary refs log tree commit diff
path: root/pkgs/applications/virtualization/docker
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2018-03-23 17:37:30 -0400
committerTim Steinbach <tim@nequissimus.com>2018-03-23 17:37:30 -0400
commitb072dcffaeba82364aa8bff7c8db63d47876deec (patch)
treec6e81bdec16c13371908f99a461ac3216ade4518 /pkgs/applications/virtualization/docker
parentf0e597252660e9550606be319b14a21ac64fa930 (diff)
downloadnixpkgs-b072dcffaeba82364aa8bff7c8db63d47876deec.tar
nixpkgs-b072dcffaeba82364aa8bff7c8db63d47876deec.tar.gz
nixpkgs-b072dcffaeba82364aa8bff7c8db63d47876deec.tar.bz2
nixpkgs-b072dcffaeba82364aa8bff7c8db63d47876deec.tar.lz
nixpkgs-b072dcffaeba82364aa8bff7c8db63d47876deec.tar.xz
nixpkgs-b072dcffaeba82364aa8bff7c8db63d47876deec.tar.zst
nixpkgs-b072dcffaeba82364aa8bff7c8db63d47876deec.zip
docker: 18.02 -> 18.03
Diffstat (limited to 'pkgs/applications/virtualization/docker')
-rw-r--r--pkgs/applications/virtualization/docker/default.nix32
1 files changed, 10 insertions, 22 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index af15240dc12..1616e176424 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -195,28 +195,16 @@ rec {
   });
 
   # Get revisions from
-  # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
-
-  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";
+  # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
+
+  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";
   };