Skip to content

Commit 05d8ad2

Browse files
authored
Merge pull request #24716 from dvdksn/fix/issue-15106-daemon-json-desktop
Add Docker Desktop note for daemon.json in logging drivers
2 parents ff9a740 + 852260a commit 05d8ad2

10 files changed

Lines changed: 43 additions & 34 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
> [!NOTE]
2+
>
3+
> If you're using Docker Desktop, edit the daemon configuration through the
4+
> Docker Desktop Dashboard. Open **Settings** and select **Docker Engine**.
5+
> For details, see
6+
> [Docker Engine settings](/manuals/desktop/settings-and-maintenance/settings.md#docker-engine).

content/manuals/engine/logging/drivers/awslogs.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ and Command Line Tools](https://docs.aws.amazon.com/cli/latest/reference/logs/in
1717
## Usage
1818

1919
To use the `awslogs` driver as the default logging driver, set the `log-driver`
20-
and `log-opt` keys to appropriate values in the `daemon.json` file, which is
21-
located in `/etc/docker/` on Linux hosts or
22-
`C:\ProgramData\docker\config\daemon.json` on Windows Server. For more about
23-
configuring Docker using `daemon.json`, see
20+
and `log-opt` keys to appropriate values in the `daemon.json` file. For more
21+
about configuring Docker using `daemon.json`, see
2422
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
23+
24+
{{% include "daemon-cfg-desktop.md" %}}
25+
2526
The following example sets the log driver to `awslogs` and sets the
2627
`awslogs-region` option.
2728

content/manuals/engine/logging/drivers/fluentd.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ Some options are supported by specifying `--log-opt` as many times as needed:
3333
- `tag`: specify a tag for Fluentd messages. Supports some Go template markup, ex `{{.ID}}`, `{{.FullID}}` or `{{.Name}}` `docker.{{.ID}}`.
3434

3535
To use the `fluentd` driver as the default logging driver, set the `log-driver`
36-
and `log-opt` keys to appropriate values in the `daemon.json` file, which is
37-
located in `/etc/docker/` on Linux hosts or
38-
`C:\ProgramData\docker\config\daemon.json` on Windows Server. For more about
39-
configuring Docker using `daemon.json`, see [daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
36+
and `log-opt` keys to appropriate values in the `daemon.json` file. For more
37+
about configuring Docker using `daemon.json`, see
38+
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
39+
40+
{{% include "daemon-cfg-desktop.md" %}}
4041

4142
The following example sets the log driver to `fluentd` and sets the
4243
`fluentd-address` option.

content/manuals/engine/logging/drivers/gcplogs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ Logging.
1414
## Usage
1515

1616
To use the `gcplogs` driver as the default logging driver, set the `log-driver`
17-
and `log-opt` keys to appropriate values in the `daemon.json` file, which is
18-
located in `/etc/docker/` on Linux hosts or
19-
`C:\ProgramData\docker\config\daemon.json` on Windows Server. For more about
20-
configuring Docker using `daemon.json`, see
17+
and `log-opt` keys to appropriate values in the `daemon.json` file. For more
18+
about configuring Docker using `daemon.json`, see
2119
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
2220

21+
{{% include "daemon-cfg-desktop.md" %}}
22+
2323
The following example sets the log driver to `gcplogs` and sets the
2424
`gcp-meta-name` option.
2525

content/manuals/engine/logging/drivers/gelf.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ In GELF, every log message is a dict with the following fields:
2323
## Usage
2424

2525
To use the `gelf` driver as the default logging driver, set the `log-driver` and
26-
`log-opt` keys to appropriate values in the `daemon.json` file, which is located
27-
in `/etc/docker/` on Linux hosts or `C:\ProgramData\docker\config\daemon.json`
28-
on Windows Server. For more about configuring Docker using `daemon.json`, see
26+
`log-opt` keys to appropriate values in the `daemon.json` file. For more about
27+
configuring Docker using `daemon.json`, see
2928
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
3029

30+
{{% include "daemon-cfg-desktop.md" %}}
31+
3132
The following example sets the log driver to `gelf` and sets the `gelf-address`
3233
option.
3334

content/manuals/engine/logging/drivers/journald.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ stores the following metadata in the journal with each message:
2828
## Usage
2929

3030
To use the `journald` driver as the default logging driver, set the `log-driver`
31-
and `log-opts` keys to appropriate values in the `daemon.json` file, which is
32-
located in `/etc/docker/` on Linux hosts or
33-
`C:\ProgramData\docker\config\daemon.json` on Windows Server. For more about
34-
configuring Docker using `daemon.json`, see
31+
and `log-opts` keys to appropriate values in the `daemon.json` file. For more
32+
about configuring Docker using `daemon.json`, see
3533
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
3634

35+
{{% include "daemon-cfg-desktop.md" %}}
36+
3737
The following example sets the log driver to `journald`:
3838

3939
```json

content/manuals/engine/logging/drivers/json-file.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ only one container.
3131
## Usage
3232

3333
To use the `json-file` driver as the default logging driver, set the `log-driver`
34-
and `log-opts` keys to appropriate values in the `daemon.json` file, which is
35-
located in `/etc/docker/` on Linux hosts or
36-
`C:\ProgramData\docker\config\` on Windows Server. If the file does not exist, create it first. For more information about
37-
configuring Docker using `daemon.json`, see
34+
and `log-opts` keys to appropriate values in the `daemon.json` file. For more
35+
information about configuring Docker using `daemon.json`, see
3836
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
3937

38+
{{% include "daemon-cfg-desktop.md" %}}
39+
4040
The following example sets the log driver to `json-file` and sets the `max-size`
4141
and `max-file` options to enable automatic log-rotation.
4242

content/manuals/engine/logging/drivers/local.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ for each file and a default count of 5 for the number of such files (to account
2626
## Usage
2727

2828
To use the `local` driver as the default logging driver, set the `log-driver`
29-
and `log-opt` keys to appropriate values in the `daemon.json` file, which is
30-
located in `/etc/docker/` on Linux hosts or
31-
`C:\ProgramData\docker\config\daemon.json` on Windows Server. For more about
32-
configuring Docker using `daemon.json`, see
29+
and `log-opt` keys to appropriate values in the `daemon.json` file. For more
30+
about configuring Docker using `daemon.json`, see
3331
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
3432

33+
{{% include "daemon-cfg-desktop.md" %}}
34+
3535
The following example sets the log driver to `local` and sets the `max-size`
3636
option.
3737

content/manuals/engine/logging/drivers/splunk.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ configuration file and restart Docker. For example:
3232
}
3333
```
3434

35-
The daemon.json file is located in `/etc/docker/` on Linux hosts or
36-
`C:\ProgramData\docker\config\daemon.json` on Windows Server. For more about
37-
configuring Docker using `daemon.json`, see
35+
For more about configuring Docker using `daemon.json`, see
3836
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
3937

38+
{{% include "daemon-cfg-desktop.md" %}}
39+
4040
> [!NOTE]
4141
>
4242
> `log-opts` configuration options in the `daemon.json` configuration file must

content/manuals/engine/logging/drivers/syslog.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ The format is defined in [RFC 5424](https://tools.ietf.org/html/rfc5424) and Doc
3535
## Usage
3636

3737
To use the `syslog` driver as the default logging driver, set the `log-driver`
38-
and `log-opt` keys to appropriate values in the `daemon.json` file, which is
39-
located in `/etc/docker/` on Linux hosts or
40-
`C:\ProgramData\docker\config\daemon.json` on Windows Server. For more about
41-
configuring Docker using `daemon.json`, see
38+
and `log-opt` keys to appropriate values in the `daemon.json` file. For more
39+
about configuring Docker using `daemon.json`, see
4240
[daemon.json](/reference/cli/dockerd.md#daemon-configuration-file).
4341

42+
{{% include "daemon-cfg-desktop.md" %}}
43+
4444
The following example sets the log driver to `syslog` and sets the
4545
`syslog-address` option. The `syslog-address` options supports both UDP and TCP;
4646
this example uses UDP.

0 commit comments

Comments
 (0)