summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiskae <546681+Kiskae@users.noreply.github.com>2024-02-21 16:29:11 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-02-29 23:37:57 +0000
commit6625c538b1f24ff2cd8effb2cb0d7f05df6d01e3 (patch)
tree06071c5f3eff3e59ff5aebed9b2931ce35638131
parentMerge pull request #292198 from NixOS/backport-291242-to-release-23.11 (diff)
downloadnixpkgs-origin/backport-290449-to-release-23.11.tar.gz
nixos/podman: pass proxy variables to podman APIorigin/backport-290449-to-release-23.11
(cherry picked from commit fe93ea4e8e83444f5258d0e593420aac71d0d177)
-rw-r--r--nixos/modules/virtualisation/podman/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
index 47382f9beab0..db1550a643ed 100644
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@@ -208,9 +208,11 @@ in
requires = [ "podman.service" ];
};
+ systemd.services.podman.environment = config.networking.proxy.envVars;
systemd.sockets.podman.wantedBy = [ "sockets.target" ];
systemd.sockets.podman.socketConfig.SocketGroup = "podman";
+ systemd.user.services.podman.environment = config.networking.proxy.envVars;
systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
systemd.timers.podman-prune.timerConfig = lib.mkIf cfg.autoPrune.enable {