From 6dfd13ab34ded1d723c8482accdff15fdd1fb19a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 26 Jul 2019 12:42:55 -0400 Subject: [PATCH] docker: 18.09.8 -> 19.03.1 Keep docker_18_09 around as it is still supported. --- pkgs/applications/virtualization/docker/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 04b2be4e6d21..a1125f25e816 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -211,4 +211,16 @@ rec { tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; + + docker_19_03 = makeOverridable dockerGen { + version = "19.03.1"; + rev = "74b1e89e8ac68948be88fe0aa1e2767ae28659fe"; + sha256 = "1m7bq7la29d8piwiq5whzcyrm7g3lv497wnri0lh6gxi10nwv06h"; + runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; + runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; + containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; + tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; + tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0304b15ac789..12ce8b087b98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17517,10 +17517,11 @@ in }; inherit (callPackage ../applications/virtualization/docker {}) - docker_18_09; + docker_18_09 + docker_19_03; - docker = docker_18_09; - docker-edge = docker_18_09; + docker = docker_19_03; + docker-edge = docker_19_03; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };