mirror of
https://github.com/nix-community/home-manager.git
synced 2025-12-01 06:31:04 +01:00
podman: added volume, image, and build quadlets (#6137)
Added support for build, image, and volume quadlets Resolved test failures due to podman 5.3.0 upgrade Replaced several instances of pkgs.podman with services.podman.package
This commit is contained in:
parent
f8bb0ba6de
commit
ce9cb2496c
24 changed files with 1000 additions and 54 deletions
|
|
@ -5,13 +5,7 @@ with lib;
|
|||
let
|
||||
cfg = config.services.podman;
|
||||
|
||||
podman-lib = import ./podman-lib.nix { inherit lib config; };
|
||||
|
||||
awaitPodmanUnshare = pkgs.writeShellScript "await-podman-unshare" ''
|
||||
until ${cfg.package}/bin/podman unshare ${pkgs.coreutils}/bin/true; do
|
||||
sleep 1;
|
||||
done
|
||||
'';
|
||||
podman-lib = import ./podman-lib.nix { inherit pkgs lib config; };
|
||||
|
||||
createQuadletSource = name: networkDef:
|
||||
let
|
||||
|
|
@ -39,7 +33,7 @@ let
|
|||
"${makeBinPath [ pkgs.su pkgs.coreutils ]}"
|
||||
]);
|
||||
};
|
||||
ExecStartPre = [ "${awaitPodmanUnshare}" ];
|
||||
ExecStartPre = [ "${podman-lib.awaitPodmanUnshare}" ];
|
||||
TimeoutStartSec = 15;
|
||||
RemainAfterExit = "yes";
|
||||
};
|
||||
|
|
@ -162,7 +156,7 @@ in {
|
|||
services.podman.internal.quadletDefinitions = networkQuadlets;
|
||||
assertions = flatten (map (network: network.assertions) networkQuadlets);
|
||||
|
||||
home.file."${config.xdg.configHome}/podman/networks.manifest".text =
|
||||
xdg.configFile."podman/networks.manifest".text =
|
||||
podman-lib.generateManifestText networkQuadlets;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue