diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-24 15:57:10 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-24 20:53:36 +1000 |
commit | b464d76126b400f921b7fb53044c5dee72f64156 (patch) | |
tree | 72434f8bb38eb4b64655034ee19bdfda397bc498 /nixos | |
parent | 320edf21f51da5c1a408fca1a77a2c8466b34c4f (diff) |
nixos/cri-o: share registries with nixos/containers
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 5 | ||||
-rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3e29c19af8fb4..955c19bd98e66 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -45,6 +45,11 @@ There is a new module for Podman(<varname>virtualisation.podman</varname>), a drop-in replacement for the Docker command line. </para> </listitem> + <listitem> + <para> + The new <varname>virtualisation.containers</varname> module manages configuration shared by the CRI-O and Podman modules. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index a8ea611f624ba..89ba9c3c66365 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -6,6 +6,10 @@ let cfg = config.virtualisation.cri-o; in { + imports = [ + (mkRenamedOptionModule [ "virtualisation" "cri-o" "registries" ] [ "virtualisation" "containers" "registries" "search" ]) + ]; + meta = { maintainers = lib.teams.podman.members; }; @@ -36,12 +40,6 @@ in default = "/pause"; description = "Pause command to be executed"; }; - - registries = mkOption { - type = types.listOf types.str; - default = [ "docker.io" "quay.io" ]; - description = "Registries to be configured for unqualified image pull"; - }; }; config = mkIf cfg.enable { @@ -57,9 +55,6 @@ in [crio.image] pause_image = "${cfg.pauseImage}" pause_command = "${cfg.pauseCommand}" - registries = [ - ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries} - ] [crio.network] plugin_dirs = ["${pkgs.cni-plugins}/bin/"] |