Skip to content

Commit

Permalink
docker: add a patch to fix Docker buildkit when using ZFS graph driver.
Browse files Browse the repository at this point in the history
The patch incorporates changes merged into the upstream in this PR:
moby/moby#43136

(cherry picked from commit 3d25f04)
  • Loading branch information
jaen authored and blitz committed Apr 29, 2022
1 parent 55ed08d commit 0d18424
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pkgs/applications/virtualization/docker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rec {
, containerdRev, containerdSha256
, tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true
# package dependencies
, stdenv, fetchFromGitHub, buildGoPackage
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
, makeWrapper, installShellFiles, pkg-config, glibc
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2
Expand Down Expand Up @@ -77,6 +77,16 @@ rec {

extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);

patches = [
# This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver.
# It could be removed when a version incorporating this patch is released.
(fetchpatch {
name = "buildkit-zfs.patch";
url = "https://github.com/moby/moby/pull/43136.patch";
sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
})
];

postPatch = ''
patchShebangs hack/make.sh hack/make/
'';
Expand Down

0 comments on commit 0d18424

Please sign in to comment.