diff options
author | Milan Pässler <milan@petabyte.dev> | 2020-10-26 12:28:43 +0100 |
---|---|---|
committer | Milan Pässler <milan@petabyte.dev> | 2020-10-27 12:48:51 +0100 |
commit | 0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea (patch) | |
tree | 48f73e11c98d1d72a7417753032fb68612bd737a /pkgs/applications/virtualization | |
parent | d2f8c8079cec841fe64524a20c30c1c12b723a1d (diff) |
docker: 19.03.12 -> 19.03.13
Added libseccomp and pkgconfig inputs to containerd, because 1.3.x requires them.
However containerd 1.2.x and 1.4.x do not.
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3dbfd8f5bb1c..4d6f53ceb5db 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -29,7 +29,9 @@ rec { patches = []; }); - docker-containerd = containerd.overrideAttrs (oldAttrs: { + docker-containerd = let + withlibseccomp = lib.versionAtLeast version "19.03"; + in containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -38,6 +40,9 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; + # This should be removed once Docker uses containerd >=1.4 + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig; + buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -210,13 +215,14 @@ rec { }; docker_19_03 = makeOverridable dockerGen rec { - version = "19.03.12"; + version = "19.03.13"; rev = "v${version}"; - sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7"; + sha256 = "139qqy8jiz1phnngknpa7c1nk9iqwd3hcc9as8x50p1vnycwzr3f"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; - containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 - containerdSha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn"; + # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above + containerdRev = "8fba4e9a7d01810a393d5d25a3621dc101981175"; # v1.3.7 + containerdSha256 = "10zy507ajslizicagb64dvbs7wmw0j4x3hdhygbdh4g2nv3mgjb7"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; |