colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename daemonConfig -> daemon.settings

Browse Source
This commit is contained in:
Bob van der Linden 2021-12-19 14:16:58 +01:00
parent 142a1540d6
commit c1b0d4acf5
No known key found for this signature in database
GPG Key ID: EEBE8E3EC4A31364
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -114,7 +114,7 @@
If you previously used If you previously used
<literal>/etc/docker/daemon.json</literal>, you need to <literal>/etc/docker/daemon.json</literal>, you need to
incorporate the changes into the new option incorporate the changes into the new option
<literal>virtualisation.docker.daemonConfig</literal>. <literal>virtualisation.docker.daemon.settings</literal>.
</para> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

2
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -41,7 +41,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter. - The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used. Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemonConfig`. - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
## Other Notable Changes {#sec-release-22.05-notable-changes} ## Other Notable Changes {#sec-release-22.05-notable-changes}

8
nixos/modules/virtualisation/docker.nix
View File

@ -8,8 +8,8 @@ let
cfg = config.virtualisation.docker; cfg = config.virtualisation.docker;
proxy_env = config.networking.proxy.envVars; proxy_env = config.networking.proxy.envVars;
daemonConfigJson = builtins.toJSON cfg.daemonConfig; daemonSettingsJson = builtins.toJSON cfg.daemon.settings;
daemonConfigFile = pkgs.writeText "daemon.json" daemonConfigJson; daemonSettingsFile = pkgs.writeText "daemon.json" daemonSettingsJson;
in in
{ {
@ -53,7 +53,7 @@ in
''; '';
}; };
daemonConfig = daemon.settings =
mkOption { mkOption {
type = types.anything; type = types.anything;
default = { }; default = { };
@ -188,7 +188,7 @@ in
${cfg.package}/bin/dockerd \ ${cfg.package}/bin/dockerd \
--group=docker \ --group=docker \
--host=fd:// \ --host=fd:// \
--config-file=${daemonConfigFile} \ --config-file=${daemonSettingsFile} \
--log-driver=${cfg.logDriver} \ --log-driver=${cfg.logDriver} \
${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
${optionalString cfg.liveRestore "--live-restore" } \ ${optionalString cfg.liveRestore "--live-restore" } \