diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-08-16 22:34:26 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-24 10:01:47 +1000 |
| commit | 008de9ca3cd22658df19276032f5d3f403a51090 (patch) | |
| tree | d9f143e0286fdc6a4e6d67cfffca476ca6ecf6db /nixos/modules/virtualisation/cri-o.nix | |
| parent | f569e1f399633976dbb3142966aaed68dd0d6e5e (diff) | |
nixos/{containers,cri-o,podman}: move copyFile to nixos/lib/utils
Diffstat (limited to 'nixos/modules/virtualisation/cri-o.nix')
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index f05ba3ff092d..aa416e7990a8 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let @@ -6,10 +6,6 @@ let crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) { } '' - cp ${filePath} $out - ''; in { imports = [ @@ -89,7 +85,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package pkgs.cri-tools ]; - environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; + environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; environment.etc."crio/crio.conf.d/00-default.conf".text = '' [crio] @@ -116,8 +112,8 @@ in ''} ''; - environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; - environment.etc."cni/net.d/99-loopback.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; + environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; + environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; |