Merge pull request #104545 from zowoq/runc
runc: add wrapper for systemd
This commit is contained in:
commit
1cdbdc3278
|
@ -9,6 +9,8 @@
|
||||||
, apparmor-parser
|
, apparmor-parser
|
||||||
, libseccomp
|
, libseccomp
|
||||||
, libselinux
|
, libselinux
|
||||||
|
, makeWrapper
|
||||||
|
, procps
|
||||||
, nixosTests
|
, nixosTests
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -26,7 +28,7 @@ buildGoPackage rec {
|
||||||
goPackagePath = "github.com/opencontainers/runc";
|
goPackagePath = "github.com/opencontainers/runc";
|
||||||
outputs = [ "out" "man" ];
|
outputs = [ "out" "man" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
|
nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ];
|
||||||
|
|
||||||
buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ];
|
buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ];
|
||||||
|
|
||||||
|
@ -43,6 +45,9 @@ buildGoPackage rec {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -Dm755 runc $out/bin/runc
|
install -Dm755 runc $out/bin/runc
|
||||||
installManPage man/*/*.[1-9]
|
installManPage man/*/*.[1-9]
|
||||||
|
wrapProgram $out/bin/runc \
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ procps ]} \
|
||||||
|
--prefix PATH : /run/current-system/systemd/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) cri-o docker podman; };
|
passthru.tests = { inherit (nixosTests) cri-o docker podman; };
|
||||||
|
|
Loading…
Reference in New Issue