diff --git a/ee/desktop/images/docker-menu-context-switch.png b/ee/desktop/images/docker-menu-context-switch.png index 59f9a33344..dea6e01b94 100644 Binary files a/ee/desktop/images/docker-menu-context-switch.png and b/ee/desktop/images/docker-menu-context-switch.png differ diff --git a/ee/desktop/images/docker-menu-settings.png b/ee/desktop/images/docker-menu-settings.png index e446dfef27..88030451c0 100644 Binary files a/ee/desktop/images/docker-menu-settings.png and b/ee/desktop/images/docker-menu-settings.png differ diff --git a/ee/desktop/images/docker-menu-switch.png b/ee/desktop/images/docker-menu-switch.png index 56a7ffeb13..6a8914fed0 100644 Binary files a/ee/desktop/images/docker-menu-switch.png and b/ee/desktop/images/docker-menu-switch.png differ diff --git a/ee/desktop/images/kube-context.png b/ee/desktop/images/kube-context.png index 3e07073072..667fa4ac8e 100644 Binary files a/ee/desktop/images/kube-context.png and b/ee/desktop/images/kube-context.png differ diff --git a/ee/desktop/images/prefs.png b/ee/desktop/images/prefs.png index 5d7edee27a..67a5be3ce4 100644 Binary files a/ee/desktop/images/prefs.png and b/ee/desktop/images/prefs.png differ diff --git a/ee/desktop/images/settings-advanced.png b/ee/desktop/images/settings-advanced.png index 4afb4f4354..e398bcdc44 100644 Binary files a/ee/desktop/images/settings-advanced.png and b/ee/desktop/images/settings-advanced.png differ diff --git a/ee/desktop/images/settings-daemon-advanced.png b/ee/desktop/images/settings-daemon-advanced.png index 7a9774ae70..0a4f7e36db 100644 Binary files a/ee/desktop/images/settings-daemon-advanced.png and b/ee/desktop/images/settings-daemon-advanced.png differ diff --git a/ee/desktop/images/settings-daemon-basic.png b/ee/desktop/images/settings-daemon-basic.png index 8a32b9a1c7..023daa94d0 100644 Binary files a/ee/desktop/images/settings-daemon-basic.png and b/ee/desktop/images/settings-daemon-basic.png differ diff --git a/ee/desktop/images/settings-general.png b/ee/desktop/images/settings-general.png index 024149c51b..ecf93b97ad 100644 Binary files a/ee/desktop/images/settings-general.png and b/ee/desktop/images/settings-general.png differ diff --git a/ee/desktop/images/settings-kubernetes.png b/ee/desktop/images/settings-kubernetes.png index ebc25a87d2..867e9a4995 100644 Binary files a/ee/desktop/images/settings-kubernetes.png and b/ee/desktop/images/settings-kubernetes.png differ diff --git a/ee/desktop/images/settings-proxies.png b/ee/desktop/images/settings-proxies.png index 05b7649140..572ce6cc6f 100644 Binary files a/ee/desktop/images/settings-proxies.png and b/ee/desktop/images/settings-proxies.png differ diff --git a/ee/desktop/images/settings-reset.png b/ee/desktop/images/settings-reset.png index aaa7cdd2dc..06f16b2a39 100644 Binary files a/ee/desktop/images/settings-reset.png and b/ee/desktop/images/settings-reset.png differ diff --git a/ee/desktop/images/settings-shared-drives.png b/ee/desktop/images/settings-shared-drives.png index 14a8ca0413..5e978c2e07 100644 Binary files a/ee/desktop/images/settings-shared-drives.png and b/ee/desktop/images/settings-shared-drives.png differ diff --git a/ee/desktop/images/whale-icon-systray-hidden.png b/ee/desktop/images/whale-icon-systray-hidden.png index b49050feb2..bbd73218cf 100644 Binary files a/ee/desktop/images/whale-icon-systray-hidden.png and b/ee/desktop/images/whale-icon-systray-hidden.png differ diff --git a/ee/desktop/images/win-ver-select.PNG b/ee/desktop/images/win-ver-select.PNG index fc43d0b610..456f797499 100644 Binary files a/ee/desktop/images/win-ver-select.PNG and b/ee/desktop/images/win-ver-select.PNG differ diff --git a/ee/desktop/user/mac-user.md b/ee/desktop/user/mac-user.md index 4ee9578598..2b68b36483 100644 --- a/ee/desktop/user/mac-user.md +++ b/ee/desktop/user/mac-user.md @@ -187,7 +187,7 @@ You can configure options on the Docker daemon that determine how your containers run. Select **Basic** to configure the daemon with interactive settings, or select -**Advanced** to edit the JSON directly. +**Advanced** to edit the JSON file directly. ![Daemon](../images/prefs-daemon-basic.png) @@ -196,7 +196,7 @@ Select **Basic** to configure the daemon with interactive settings, or select Docker Desktop Enterprise has experimental features enabled on Docker Engine, as described in [Docker Experimental Features](https://github.com/docker/cli/blob/master/experimental/README.md) Readme. If you don't select **Experimental Features**, Docker Desktop Enterprise uses the current generally available release of Docker Engine. -> **Note:** Do not enable experimental features in production. Experimental features are not appropriate for production environments or workloads. They are meant to be sandbox experiments for new ideas. +> {% include experimental.md %} You can see whether you are running experimental mode at the command line. If `Experimental` is `true`, then Docker is running in experimental mode, as shown @@ -224,9 +224,9 @@ For more information, see: Click the **Advanced** tab to configure the daemon from the JSON file. For a full list of options, see the Docker Engine [dockerd command line reference](https://docs.docker.com/engine/reference/commandline/dockerd). -Click **Apply & Restart** to save your settings and reboot Docker. Or, to cancel +Click **Apply & Restart** to save your settings and reboot Docker. To cancel changes, click another preference tab, then choose to discard or not apply -changes when asked. +changes when prompted. ![Docker Daemon](../images/prefs-daemon-adv.png) @@ -277,7 +277,7 @@ Click on the Docker icon from the menu bar and then **Preferences**. Click **Res ![Uninstall or reset Docker](../images/prefs-reset-mac.png) -### Diagnose and Feedback +### Troubleshoot The **Diagnose and Feedback** option allows you troubleshoot any issues you may be experiencing with Docker Desktop Enterprise. For more information, see [Troubleshoot DDE issues on Mac](/ee/desktop/troubleshoot/mac-issues). @@ -316,7 +316,7 @@ an example. $ sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain ca.crt ``` -Or, if you prefer to add the certificate to your own local keychain only (rather +If you prefer to add the certificate to your own local keychain only (rather than for all users), run this command instead: ``` diff --git a/ee/desktop/user/windows-user.md b/ee/desktop/user/windows-user.md index 80e103c9d7..e4c49ff8a1 100644 --- a/ee/desktop/user/windows-user.md +++ b/ee/desktop/user/windows-user.md @@ -251,6 +251,8 @@ The Linux VM restarts after changing the settings on the **Advanced** tab. This - **Memory** - Change the amount of memory the Docker Desktop Enterprise Linux VM uses. +- **Swap** - Configure the swap file size. + #### Network You can configure Docker Desktop Enterprise networking to work on a virtual private network (VPN). @@ -314,8 +316,7 @@ The **Basic** mode lets you configure the more common daemon options with intera Docker Desktop Enterprise has the experimental version of Docker Engine enabled, described in the [Docker Experimental Features](https://github.com/docker/cli/blob/master/experimental/README.md) readme. If you don't select **Experimental Features**, Docker Desktop Enterprise uses the current generally available release of Docker Engine. -> **Note:** Do not enable experimental features in production. Experimental features are not appropriate for production environments or -workloads. They are meant to be sandbox experiments for new ideas. +> {% include experimental.md %} Run `docker version` to see if you are in Experimental mode. Experimental mode is listed under `Server` data. If `Experimental` is `true`, then Docker is @@ -438,7 +439,7 @@ To switch to a different version pack, simply click on the version pack you woul ![Version Selection](../images/win-ver-select.PNG) -### Diagnose and Feedback +### Troubleshoot The **Diagnose and Feedback** option allows you troubleshoot any issues you may be experiencing with Docker Desktop Enterprise. For more information, see [Troubleshoot DDE issues on Windows](/ee/desktop/troubleshoot/windows-issues).