Skip to content

Commit 36a5768

Browse files
committed
docker -> podman
1 parent e579124 commit 36a5768

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

nix/configuration.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,9 +485,9 @@ in {
485485
networking.firewall.enable = true;
486486
networking.nameservers = ["8.8.8.8" "8.8.4.4"];
487487
virtualisation.virtualbox.host.enable = true;
488-
virtualisation.docker.enable = false;
488+
virtualisation.containers.enable = true;
489489
virtualisation.podman.enable = true;
490-
virtualisation.podman.dockerSocket.enable = true;
490+
virtualisation.podman.dockerCompat = true;
491491
virtualisation.podman.defaultNetwork.settings.dns_enabled = true;
492492
users.extraGroups.vboxusers.members = [config.services.functora.userName];
493493
networking.extraHosts = blocked-hosts;
@@ -500,7 +500,6 @@ in {
500500
"wheel"
501501
"input"
502502
"uinput"
503-
"docker"
504503
"podman"
505504
"plugdev"
506505
"adbusers"

nix/misc.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ in
9191
config = mkIf config.services."${srv}".enable {
9292
virtualisation.oci-containers.containers.${srv} = {
9393
image = img;
94+
#
95+
# TODO : remove after bugfix https://github.com/NixOS/nixpkgs/issues/272480
96+
#
97+
extraOptions = ["--network=host"];
9498
volumes =
9599
(map (x: x + ":" + x + ":ro") cfg)
96100
++ (map (x: x + ":" + x) mnt);

nix/rpi4.nix

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ in {
5656
password = password;
5757
extraGroups = [
5858
"wheel"
59-
"docker"
59+
"podman"
6060
];
6161
};
6262
};
@@ -102,7 +102,10 @@ in {
102102
settings.PermitRootLogin = "no";
103103
};
104104
#
105-
# Docker
105+
# Containers
106106
#
107-
virtualisation.docker.enable = true;
107+
virtualisation.containers.enable = true;
108+
virtualisation.podman.enable = true;
109+
virtualisation.podman.dockerCompat = true;
110+
virtualisation.podman.defaultNetwork.settings.dns_enabled = true;
108111
}

prv

Submodule prv updated from 82e9951 to 1b521f9

0 commit comments

Comments
 (0)