diff options
| author | Florian Klink <flokli@flokli.de> | 2022-05-03 10:09:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 10:09:22 +0200 |
| commit | f0df5506029220d9ee4c3f4c47ac4913c6cc2f03 (patch) | |
| tree | f533a247f8a2b35de5b6439d2ba0a5d618b6170e | |
| parent | f20de92232ffc9eb3faeb9d49b451c9fcee2af32 (diff) | |
| parent | 46241e156c26b6b738e028fec3b5f931e5a7ccf7 (diff) | |
Merge pull request #170650 from adisbladis/oci-containers-default-backend
nixos/virtualisation.oci-containers: Use podman as the default backend
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 13 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2205.section.md | 3 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/oci-containers.nix | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 10608685c471..1e3f269dafb2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -511,6 +511,19 @@ </listitem> <listitem> <para> + For new installations + <literal>virtualisation.oci-containers.backend</literal> is + now set to <literal>podman</literal> by default. If you still + want to use Docker on systems where + <literal>system.stateVersion</literal> is set to to + <literal>"22.05"</literal> set + <literal>virtualisation.oci-containers.backend = "docker";</literal>.Old + systems with older <literal>stateVersion</literal>s stay with + <quote>docker</quote>. + </para> + </listitem> + <listitem> + <para> <literal>security.klogd</literal> was removed. Logging of kernel messages is handled by systemd since Linux 3.5. </para> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 3b118d4e03d2..dcfabf01ff3d 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -164,6 +164,9 @@ In addition to numerous new and upgraded packages, this release has the followin This is to improve compatibility with `libcontainer` based software such as Podman and Skopeo which assumes they have ownership over `/etc/containers`. +- For new installations `virtualisation.oci-containers.backend` is now set to `podman` by default. + If you still want to use Docker on systems where `system.stateVersion` is set to to `"22.05"` set `virtualisation.oci-containers.backend = "docker";`.Old systems with older `stateVersion`s stay with "docker". + - `security.klogd` was removed. Logging of kernel messages is handled by systemd since Linux 3.5. diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index f40481727830..fa5fe9973044 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -338,11 +338,7 @@ in { backend = mkOption { type = types.enum [ "podman" "docker" ]; - default = - # TODO: Once https://github.com/NixOS/nixpkgs/issues/77925 is resolved default to podman - # if versionAtLeast config.system.stateVersion "20.09" then "podman" - # else "docker"; - "docker"; + default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker"; description = "The underlying Docker implementation to use."; }; |