summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2021-12-15 01:07:58 +0300
committerNikolay Amiantov <ab@fmap.me>2021-12-22 14:23:23 +0300
commitab64310a5e5534a8c96d6523ba5a765d27beceaf (patch)
treedf239bf068804458e7a61b8d8df862c5f09f304a /nixos/doc
parent721fde93ffcc941b7486e3ec77121d9a8ddbd64f (diff)
downloadnixpkgs-ab64310a5e5534a8c96d6523ba5a765d27beceaf.tar
nixpkgs-ab64310a5e5534a8c96d6523ba5a765d27beceaf.tar.gz
nixpkgs-ab64310a5e5534a8c96d6523ba5a765d27beceaf.tar.bz2
nixpkgs-ab64310a5e5534a8c96d6523ba5a765d27beceaf.tar.lz
nixpkgs-ab64310a5e5534a8c96d6523ba5a765d27beceaf.tar.xz
nixpkgs-ab64310a5e5534a8c96d6523ba5a765d27beceaf.tar.zst
nixpkgs-ab64310a5e5534a8c96d6523ba5a765d27beceaf.zip
docker-rootless service: init
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml8
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md1
2 files changed, 9 insertions, 0 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 ae6ff9d434a..d11b29a6334 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
@@ -35,6 +35,14 @@
       </listitem>
       <listitem>
         <para>
+          <link xlink:href="https://docs.docker.com/engine/security/rootless/">rootless
+          Docker</link>, a <literal>systemd --user</literal> Docker
+          service which runs without root permissions. Available as
+          <link xlink:href="options.html#opt-virtualisation.docker.rootless.enable">virtualisation.docker.rootless.enable</link>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html">filebeat</link>,
           a lightweight shipper for forwarding and centralizing log
           data. Available as
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 3e7f8d451b2..3990a3359b6 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -11,6 +11,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 ## New Services {#sec-release-22.05-new-services}
 
 - [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).
+- [rootless Docker](https://docs.docker.com/engine/security/rootless/), a `systemd --user` Docker service which runs without root permissions. Available as [virtualisation.docker.rootless.enable](options.html#opt-virtualisation.docker.rootless.enable).
 
 - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable).