From 099712f78dad5bbd2bc7279cf0cfe67f2a25803b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Andr=C3=A9?= Date: Wed, 9 Dec 2015 15:50:18 +0100 Subject: [PATCH 1/3] nixos-manual: fix incomplete container doc --- .../manual/administration/declarative-containers.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 228c45b0c1f..253be80b9c4 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -22,8 +22,10 @@ containers.database = If you run nixos-rebuild switch, the container will -be built and started. If the container was already running, it will be -updated in place, without rebooting. +be built. If the container was already running, it will be +updated in place, without rebooting. Container can be configured to +start automatically by setting autoStart = true +in its configuration. By default, declarative containers share the network namespace of the host, meaning that they can listen on (privileged) @@ -41,13 +43,15 @@ containers.database = This gives the container a private virtual Ethernet interface with IP address 192.168.100.11, which is hooked up to a virtual Ethernet interface on the host with IP address -192.168.100.10. (See the next section for details +192.168.100.10. (See the next section for details on container networking.) To disable the container, just remove it from configuration.nix and run nixos-rebuild switch. Note that this will not delete the root directory of -the container in /var/lib/containers. +the container in /var/lib/containers. Containers can be +destroyed using the imperative method: nixos-container destroy + foo. Declarative containers can be started and stopped using the corresponding systemd service, e.g. systemctl start From b8495e4a0485cc9421d8a19dd6a32c0dfdb55bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Andr=C3=A9?= Date: Wed, 9 Dec 2015 21:01:47 +0100 Subject: [PATCH 2/3] nixos-manual: develop autoStart option for containers --- nixos/doc/manual/administration/declarative-containers.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 253be80b9c4..dccc8b0cb0d 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -24,7 +24,7 @@ containers.database = If you run nixos-rebuild switch, the container will be built. If the container was already running, it will be updated in place, without rebooting. Container can be configured to -start automatically by setting autoStart = true +start automatically by setting containers.database.autoStart = true in its configuration. By default, declarative containers share the network namespace From 94ad6e44448db1037deec9134eb64f050668c3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Andr=C3=A9?= Date: Thu, 10 Dec 2015 19:17:06 +0100 Subject: [PATCH 3/3] nixos-manual: fix grammar --- nixos/doc/manual/administration/declarative-containers.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index dccc8b0cb0d..f3f65edcec2 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -23,7 +23,7 @@ containers.database = If you run nixos-rebuild switch, the container will be built. If the container was already running, it will be -updated in place, without rebooting. Container can be configured to +updated in place, without rebooting. The container can be configured to start automatically by setting containers.database.autoStart = true in its configuration.