engine: fix the macos daemon preferences (#16336)

* engine: fixed the macos preferences

Signed-off-by: David Karlsson <david.karlsson@docker.com>
This commit is contained in:
David Karlsson 2022-12-14 13:38:17 +01:00 committed by GitHub
parent ce218329f2
commit 756d3c1e40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 107 additions and 25 deletions

View File

@ -25,9 +25,16 @@ redirect_from:
title: Docker daemon configuration overview
---
After successfully installing and starting Docker, the `dockerd` daemon runs
with its default configuration. This page shows how to customize the daemon
configuration.
This page shows you how to customize the Docker daemon, `dockerd`.
> **Note**
>
> This page is for users who've installed Docker Engine manually. If you're
> using Docker Desktop, refer to the following pages instead:
>
> - [Change preferences on Mac](../../desktop/settings/mac#docker-engine)
> - [Change preferences on Windows](../../desktop/settings/windows#docker-engine)
> - [Change preferences on Linux](../../desktop/settings/linux#docker-engine)
## Configure the Docker daemon
@ -43,18 +50,22 @@ won't start and prints an error message.
To configure the Docker daemon using a JSON file, create a file at
`/etc/docker/daemon.json` on Linux systems, or
`C:\ProgramData\docker\config\daemon.json` on Windows. On macOS go to the whale
in the taskbar and select **Preferences** > **Daemon** > **Advanced**.
`C:\ProgramData\docker\config\daemon.json` on Windows.
Here's what the configuration file looks like:
Here's what the configuration file might look like:
```json
{
"debug": true,
"tls": true,
"tlscert": "/var/docker/server.pem",
"tlskey": "/var/docker/serverkey.pem",
"hosts": ["tcp://192.168.59.3:2376"]
"builder": {
"gc": {
"defaultKeepStorage": "20GB",
"enabled": true
}
},
"experimental": false,
"features": {
"buildkit": true
}
}
```

View File

@ -113,14 +113,43 @@ To prevent developers from accidentally changing the proxy settings, see
Docker Desktop uses a private IPv4 network for internal services such as a DNS server and an HTTP proxy. In case the choice of subnet clashes with something in your environment, specify a custom subnet using the **Network** setting.
### Docker Engine
## Docker Engine
The **Docker Engine** tab allows you to configure the Docker daemon to determine how your containers run.
The **Docker Engine** tab allows you to configure the Docker daemon used to run containers with Docker Desktop.
Type a JSON configuration file in the box to configure the daemon settings. For a full list of options, see the Docker Engine
[dockerd commandline reference](/engine/reference/commandline/dockerd/){:target="_blank" rel="noopener" class="_"}.
You configure the daemon using a JSON configuration file. Here's what the file might look like:
Click **Apply & Restart** to save your settings and restart Docker Desktop.
```json
{
"builder": {
"gc": {
"defaultKeepStorage": "20GB",
"enabled": true
}
},
"experimental": false,
"features": {
"buildkit": true
}
}
```
You can find this file at `$HOME/.docker/daemon.json`. To change the configuration, either
edit the JSON configuration directly from the dashboard in Docker Desktop, or open and
edit the file using your favorite text editor.
> **Note**
>
> Only the **Docker Desktop** daemon uses the configuration file under `$HOME/.docker`.
> If you manually install Docker Engine alongside Docker Desktop, the manually
> installed instance uses a `dameon.json` configuration file in a different location.
> Refer to [Configure the daemon](../../config/daemon/index.md) for more information
> about how to configure the Docker daemon on a manually installed Docker Engine.
To see the full list of possible configuration options, see the
[dockerd command reference](/engine/reference/commandline/dockerd/).
Select **Apply & Restart** to save your settings and restart Docker Desktop.
## Kubernetes

View File

@ -157,12 +157,33 @@ You can configure Docker Desktop networking to work on a virtual private network
## Docker Engine
The **Docker Engine** tab allows you to configure the Docker daemon to determine how your containers run.
The **Docker Engine** tab allows you to configure the Docker daemon used to run containers with Docker Desktop.
Type a JSON configuration file in the box to configure the daemon settings. For a full list of options, see the Docker Engine
[dockerd commandline reference](/engine/reference/commandline/dockerd/){:target="_blank" rel="noopener" class="_"}.
You configure the daemon using a JSON configuration file. Here's what the file might look like:
Click **Apply & Restart** to save your settings and restart Docker Desktop.
```json
{
"builder": {
"gc": {
"defaultKeepStorage": "20GB",
"enabled": true
}
},
"experimental": false,
"features": {
"buildkit": true
}
}
```
You can find this file at `$HOME/.docker/daemon.json`. To change the configuration, either
edit the JSON configuration directly from the dashboard in Docker Desktop, or open and
edit the file using your favorite text editor.
To see the full list of possible configuration options, see the
[dockerd command reference](/engine/reference/commandline/dockerd/).
Select **Apply & Restart** to save your settings and restart Docker Desktop.
## Kubernetes

View File

@ -200,12 +200,33 @@ For more details on configuring Docker Desktop to use WSL 2, see
## Docker Engine
The **Docker Engine** tab allows you to configure the Docker daemon to determine how your containers run.
The **Docker Engine** tab allows you to configure the Docker daemon used to run containers with Docker Desktop.
Type a JSON configuration file in the box to configure the daemon settings. For a full list of options, see the Docker Engine
[dockerd commandline reference](/engine/reference/commandline/dockerd/){:target="_blank" rel="noopener" class="_"}.
You configure the daemon using a JSON configuration file. Here's what the file might look like:
Click **Apply & Restart** to save your settings and restart Docker Desktop.
```json
{
"builder": {
"gc": {
"defaultKeepStorage": "20GB",
"enabled": true
}
},
"experimental": false,
"features": {
"buildkit": true
}
}
```
You can find this file at `$HOME/.docker/daemon.json`. To change the configuration, either
edit the JSON configuration directly from the dashboard in Docker Desktop, or open and
edit the file using your favorite text editor.
To see the full list of possible configuration options, see the
[dockerd command reference](/engine/reference/commandline/dockerd/).
Select **Apply & Restart** to save your settings and restart Docker Desktop.
## Kubernetes
@ -269,4 +290,4 @@ Turns on the experimental containerd image store. This brings new features like
### Experimental features
{% include desktop-experimental.md %}
{% include desktop-experimental.md %}