public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122810 from lukegb/docker-and-nat

Browse Source 
nixos/docker: fix evaluation when NAT is enabled too
This commit is contained in:
Luke Granger-Brown 2021-05-13 17:28:55 +01:00 committed by GitHub
commit 7b056fe82d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/virtualisation/docker.nix
View File

@ -151,8 +151,8 @@ in
config = mkIf cfg.enable (mkMerge [{ config = mkIf cfg.enable (mkMerge [{
boot.kernelModules = [ "bridge" "veth" ]; boot.kernelModules = [ "bridge" "veth" ];
boot.kernel.sysctl = { boot.kernel.sysctl = {
"net.ipv4.conf.all.forwarding" = mkOverride 99 true; "net.ipv4.conf.all.forwarding" = mkOverride 98 true;
"net.ipv4.conf.default.forwarding" = mkOverride 99 true; "net.ipv4.conf.default.forwarding" = mkOverride 98 true;
}; };
environment.systemPackages = [ cfg.package ] environment.systemPackages = [ cfg.package ]
++ optional cfg.enableNvidia pkgs.nvidia-docker; ++ optional cfg.enableNvidia pkgs.nvidia-docker;