Skip to content

Commit

Permalink
nixos/podman: Create real docker socket instead of symlink
Browse files Browse the repository at this point in the history
This ensures that both sockets are available after sockets.target.
See hercules-ci/arion#238
  • Loading branch information
roberth committed Apr 21, 2024
1 parent 4c0263b commit def0c98
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions nixos/modules/virtualisation/podman/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,11 @@ in
systemd.services.podman.environment = config.networking.proxy.envVars;
systemd.sockets.podman.wantedBy = [ "sockets.target" ];
systemd.sockets.podman.socketConfig.SocketGroup = "podman";
systemd.sockets.podman.socketConfig.ListenStream = [
"/run/podman/podman.sock"
] ++ lib.optional cfg.dockerSocket.enable [
"/run/docker.sock"
];

systemd.user.services.podman.environment = config.networking.proxy.envVars;
systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
Expand All @@ -239,11 +244,6 @@ in
'')
];

systemd.tmpfiles.rules =
lib.optionals cfg.dockerSocket.enable [
"L! /run/docker.sock - - - - /run/podman/podman.sock"
];

users.groups.podman = { };

assertions = [
Expand Down

0 comments on commit def0c98

Please sign in to comment.