docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A few more DD doc fixes (#18277) 

* Fix FAQ answer on support for Docker Desktop on virtualized hardware.

Signed-off-by: Cesar Talledo <cesar.talledo@docker.com>

* Indicate location of settings.json file on Linux hosts.

Signed-off-by: Cesar Talledo <cesar.talledo@docker.com>

---------

Signed-off-by: Cesar Talledo <cesar.talledo@docker.com>
This commit is contained in:
Cesar Talledo 2023-09-26 00:07:53 -07:00 committed by GitHub
parent c6d15833e1
commit 1fa4e7ec70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/desktop/faqs/general.md
View File

@ -69,7 +69,7 @@ You can find information about diagnosing and troubleshooting common issues in t
If you do not find a solution in troubleshooting, browse the Github repositories or create a new issue: If you do not find a solution in troubleshooting, browse the Github repositories or create a new issue:
- [docker/for-mac](https://github.com/docker/for-mac/issues) - [docker/for-mac](https://github.com/docker/for-mac/issues)
- [docker/for-win](https://github.com/docker/for-win/issues) - [docker/for-win](https://github.com/docker/for-win/issues)
- [docker/for-linux](https://github.com/docker/for-linux/issues) - [docker/for-linux](https://github.com/docker/for-linux/issues)
@ -126,4 +126,4 @@ After updating the `settings.json` file, close and restart Docker Desktop to app
### Can I run Docker Desktop on Virtualized hardware? ### Can I run Docker Desktop on Virtualized hardware?
No, currently this is unsupported and against terms of use. Yes, see section [Run Docker Desktop for Windows in a VM or VDI environment](../vm-vdi.md) for more information on how to do this.

10
content/desktop/settings/linux.md
View File

@ -12,6 +12,8 @@ To navigate to **Settings** either:
- Select the Docker menu {{< inline-image src="../images/whale-x.svg" alt="whale menu" >}} and then **Settings** - Select the Docker menu {{< inline-image src="../images/whale-x.svg" alt="whale menu" >}} and then **Settings**
- Select the **Settings** icon from the Docker Dashboard. - Select the **Settings** icon from the Docker Dashboard.
You can also locate the `settings.json` file at `~/.docker/desktop/settings.json`.
## General ## General
On the **General** tab, you can configure when to start Docker and specify other settings: On the **General** tab, you can configure when to start Docker and specify other settings:
@ -40,7 +42,7 @@ If you choose the integrated terminal, you can run commands in a running contain
> >
> This setting is only available if you are signed in to Docker Desktop and have a Docker Business subscription. > This setting is only available if you are signed in to Docker Desktop and have a Docker Business subscription.
- **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively. - **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively.
## Resources ## Resources
@ -152,7 +154,7 @@ edit the file using your favorite text editor.
> Refer to [Configure the daemon](../../config/daemon/index.md) for more information > 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. > about how to configure the Docker daemon on a manually installed Docker Engine.
To see the full list of possible configuration options, see the To see the full list of possible configuration options, see the
[dockerd command reference](/engine/reference/commandline/dockerd/). [dockerd command reference](/engine/reference/commandline/dockerd/).
Select **Apply & Restart** to save your settings and restart Docker Desktop. Select **Apply & Restart** to save your settings and restart Docker Desktop.
@ -193,7 +195,7 @@ when an update becomes available. After downloading the update, select
**Apply and Restart** to install the update. You can do this either through the **Apply and Restart** to install the update. You can do this either through the
Docker menu or in the **Updates** section in the Docker Dashboard. Docker menu or in the **Updates** section in the Docker Dashboard.
## Extensions ## Extensions
Use the **Extensions** tab to: Use the **Extensions** tab to:
@ -219,4 +221,4 @@ Turns on the containerd image store. This brings new features like faster contai
### Experimental features ### Experimental features
{{< include "desktop-experimental.md" >}} {{< include "desktop-experimental.md" >}}

26
content/desktop/settings/mac.md
View File

@ -34,13 +34,13 @@ If you choose the integrated terminal, you can run commands in a running contain
- **Include VM in Time Machine backups**. Select to back up the Docker Desktop - **Include VM in Time Machine backups**. Select to back up the Docker Desktop
virtual machine. This option is turned off by default. virtual machine. This option is turned off by default.
- **Use Virtualization framework**. Select to allow Docker Desktop to use the `virtualization.framework` instead of the `hypervisor.framework`. - **Use Virtualization framework**. Select to allow Docker Desktop to use the `virtualization.framework` instead of the `hypervisor.framework`.
> **Tip** > **Tip**
> >
> Turn this setting on to make Docker Desktop run faster. > Turn this setting on to make Docker Desktop run faster.
{ .tip } { .tip }
- **Choose file sharing implementation for your containers**. Choose whether you want to share files using **VirtioFS**, **gRPC FUSE**, or **osxfs**. VirtioFS is only available for macOS versions 12.5 and above, and is turned on by default. - **Choose file sharing implementation for your containers**. Choose whether you want to share files using **VirtioFS**, **gRPC FUSE**, or **osxfs**. VirtioFS is only available for macOS versions 12.5 and above, and is turned on by default.
>**Tip** >**Tip**
> >
> Use VirtioFS for speedy file sharing. VirtioFS has reduced the time taken to complete filesystem operations by [up to 98%](https://github.com/docker/roadmap/issues/7#issuecomment-1044452206) > Use VirtioFS for speedy file sharing. VirtioFS has reduced the time taken to complete filesystem operations by [up to 98%](https://github.com/docker/roadmap/issues/7#issuecomment-1044452206)
@ -62,7 +62,7 @@ If you choose the integrated terminal, you can run commands in a running contain
> >
> This setting is only available if you are signed in to Docker Desktop and have a Docker Business subscription. > This setting is only available if you are signed in to Docker Desktop and have a Docker Business subscription.
- **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively. - **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively.
## Resources ## Resources
@ -94,7 +94,7 @@ You can also move the disk image to a different location. If you attempt to move
>**Tip** >**Tip**
> >
> If you're running multi-container workloads, increase the memory and disk image space allocation to something higher. > If you're running multi-container workloads, increase the memory and disk image space allocation to something higher.
{ .tip } { .tip }
### File sharing ### File sharing
@ -197,7 +197,7 @@ You can find this file at `$HOME/.docker/daemon.json`. To change the configurati
edit the JSON configuration directly from the dashboard in Docker Desktop, or open and edit the JSON configuration directly from the dashboard in Docker Desktop, or open and
edit the file using your favorite text editor. edit the file using your favorite text editor.
To see the full list of possible configuration options, see the To see the full list of possible configuration options, see the
[dockerd command reference](/engine/reference/commandline/dockerd/). [dockerd command reference](/engine/reference/commandline/dockerd/).
Select **Apply & Restart** to save your settings and restart Docker Desktop. Select **Apply & Restart** to save your settings and restart Docker Desktop.
@ -238,7 +238,7 @@ when an update becomes available. After downloading the update, select
**Apply and Restart** to install the update. You can do this either through the **Apply and Restart** to install the update. You can do this either through the
Docker menu or in the **Updates** section in the Docker Dashboard. Docker menu or in the **Updates** section in the Docker Dashboard.
## Extensions ## Extensions
Use the **Extensions** tab to: Use the **Extensions** tab to:
@ -262,9 +262,9 @@ You can also sign up to the [Developer Preview program](https://www.docker.com/c
Turns on the containerd image store. This brings new features like faster container startup performance by lazy-pulling images, and the ability to run Wasm applications with Docker. For more information, see [containerd image store](../containerd/index.md). Turns on the containerd image store. This brings new features like faster container startup performance by lazy-pulling images, and the ability to run Wasm applications with Docker. For more information, see [containerd image store](../containerd/index.md).
#### Use Rosetta for x86/AMD64 emulation on Apple Silicon. #### Use Rosetta for x86/AMD64 emulation on Apple Silicon.
Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This option is only available if you have turned on **Virtualization framework** in the **General** settings tab. Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This option is only available if you have turned on **Virtualization framework** in the **General** settings tab.
### Experimental features ### Experimental features
@ -274,15 +274,15 @@ Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This
On the **Advanced** tab, you can reconfigure your initial installation settings: On the **Advanced** tab, you can reconfigure your initial installation settings:
- **Choose how to configure the installation of Docker's CLI tools**. - **Choose how to configure the installation of Docker's CLI tools**.
- **System**: Docker CLI tools are installed in the system directory under `/usr/local/bin` - **System**: Docker CLI tools are installed in the system directory under `/usr/local/bin`
- **User**: Docker CLI tools are installed in the user directory under `$HOME/.docker/bin`. You must then add `$HOME/.docker/bin` to your PATH. To add `$HOME/.docker/bin` to your path: - **User**: Docker CLI tools are installed in the user directory under `$HOME/.docker/bin`. You must then add `$HOME/.docker/bin` to your PATH. To add `$HOME/.docker/bin` to your path:
1. Open your shell configuration file. This is `~/.bashrc` if you're using a bash shell, or `~/.zshrc` if you're using a zsh shell. 1. Open your shell configuration file. This is `~/.bashrc` if you're using a bash shell, or `~/.zshrc` if you're using a zsh shell.
2. Run the following command: 2. Run the following command:
```console ```console
$ export PATH=$PATH:~/.docker/bin $ export PATH=$PATH:~/.docker/bin
``` ```
3. Save and the close the file. Restart your shell to apply the changes to the PATH variable. 3. Save and the close the file. Restart your shell to apply the changes to the PATH variable.
- **Enable default Docker socket (Requires password)**. Creates `/var/run/docker.sock` which some third party clients may use to communicate with Docker Desktop. For more information, see [permission requirements for macOS](../mac/permission-requirements.md#installing-symlinks). - **Enable default Docker socket (Requires password)**. Creates `/var/run/docker.sock` which some third party clients may use to communicate with Docker Desktop. For more information, see [permission requirements for macOS](../mac/permission-requirements.md#installing-symlinks).
@ -290,4 +290,4 @@ On the **Advanced** tab, you can reconfigure your initial installation settings:
For more information on each configuration and use case, see [Permission requirements](../mac/permission-requirements.md). For more information on each configuration and use case, see [Permission requirements](../mac/permission-requirements.md).
- **Automatically check configuration**. Regularly checks your configuration to ensure no unexpected changes have been made by another application. - **Automatically check configuration**. Regularly checks your configuration to ensure no unexpected changes have been made by another application.