docker_29: init at 29.1.2

This commit is contained in:
teutat3s
2025-12-08 15:38:29 +01:00
parent 126aad46a4
commit e450bcf540
2 changed files with 26 additions and 2 deletions
@@ -39,6 +39,7 @@ let
docker-sbom,
docker-init,
iptables,
nftables,
e2fsprogs,
xz,
util-linuxMinimal,
@@ -164,6 +165,7 @@ let
buildInputs = [
sqlite
]
++ lib.optionals (lib.versionAtLeast version "29.0.0") [ nftables ]
++ lib.optionals withLvm [ lvm2 ]
++ lib.optionals withBtrfs [ btrfs-progs ]
++ lib.optionals withSystemd [ systemd ]
@@ -191,7 +193,10 @@ let
);
postPatch = ''
patchShebangs hack/make.sh hack/make/ hack/with-go-mod.sh
patchShebangs hack/make.sh hack/make/
''
+ lib.optionalString (lib.versionOlder version "29.0.0") ''
patchShebangs hack/with-go-mod.sh
'';
buildPhase = ''
@@ -217,7 +222,7 @@ let
--prefix PATH : "$out/libexec/docker:$extraPath"
ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd
ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim
ln -s ${docker-containerd}/bin/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") ''-runc-v2''} $out/libexec/docker/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") ''-runc-v2''}
ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc
ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
@@ -425,4 +430,22 @@ in
tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
};
docker_29 =
let
version = "29.1.2";
in
callPackage dockerGen {
inherit version;
cliRev = "v${version}";
cliHash = "sha256-dmoCHxXOYalJCaqq32MdsAEJ+xq0aH/8fOpJHVnBxxU=";
mobyRev = "docker-v${version}";
mobyHash = "sha256-SRMaPAdg2nlWuKKQILZEGHZO6TGLh2Ci1UIWqcyo6IM=";
runcRev = "v1.3.4";
runcHash = "sha256-1IfY08sBoDpbLrwz1AKBRSTuCZyOgQzYPHTDUI6fOZ8=";
containerdRev = "v2.2.0";
containerdHash = "sha256-LXBGA03FTrrbxlH+DxPBFtp3/AYQf096YE2rpe6A+WM=";
tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
};
}
+1
View File
@@ -10667,6 +10667,7 @@ with pkgs;
inherit (callPackage ../applications/virtualization/docker { })
docker_25
docker_28
docker_29
;
docker = docker_28;