diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2021-12-19 14:16:58 +0100 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2021-12-19 14:16:58 +0100 |
| commit | c1b0d4acf56526dc8901135fdd668c48e7710632 (patch) | |
| tree | bdf573bb36092108cda77163a76c25d5a75f2fe8 /nixos | |
| parent | 142a1540d6f1d28f80489212684945ab65a1cee6 (diff) | |
| download | nixpkgs-c1b0d4acf56526dc8901135fdd668c48e7710632.tar nixpkgs-c1b0d4acf56526dc8901135fdd668c48e7710632.tar.gz nixpkgs-c1b0d4acf56526dc8901135fdd668c48e7710632.tar.bz2 nixpkgs-c1b0d4acf56526dc8901135fdd668c48e7710632.tar.lz nixpkgs-c1b0d4acf56526dc8901135fdd668c48e7710632.tar.xz nixpkgs-c1b0d4acf56526dc8901135fdd668c48e7710632.tar.zst nixpkgs-c1b0d4acf56526dc8901135fdd668c48e7710632.zip | |
rename daemonConfig -> daemon.settings
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2205.section.md | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/docker.nix | 8 |
3 files changed, 6 insertions, 6 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 e861164920f..4d3d5700ffc 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 @@ -114,7 +114,7 @@ If you previously used <literal>/etc/docker/daemon.json</literal>, you need to incorporate the changes into the new option - <literal>virtualisation.docker.daemonConfig</literal>. + <literal>virtualisation.docker.daemon.settings</literal>. </para> </listitem> </itemizedlist> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 17e1727dfbc..966de788937 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -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. 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} diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 80bf804cb29..e273b964f58 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -8,8 +8,8 @@ let cfg = config.virtualisation.docker; proxy_env = config.networking.proxy.envVars; - daemonConfigJson = builtins.toJSON cfg.daemonConfig; - daemonConfigFile = pkgs.writeText "daemon.json" daemonConfigJson; + daemonSettingsJson = builtins.toJSON cfg.daemon.settings; + daemonSettingsFile = pkgs.writeText "daemon.json" daemonSettingsJson; in { @@ -53,7 +53,7 @@ in ''; }; - daemonConfig = + daemon.settings = mkOption { type = types.anything; default = { }; @@ -188,7 +188,7 @@ in ${cfg.package}/bin/dockerd \ --group=docker \ --host=fd:// \ - --config-file=${daemonConfigFile} \ + --config-file=${daemonSettingsFile} \ --log-driver=${cfg.logDriver} \ ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ ${optionalString cfg.liveRestore "--live-restore" } \ |