diff --git a/desktop/extensions.md b/desktop/extensions.md index 58cbe4b9e8..ea57ce33d6 100644 --- a/desktop/extensions.md +++ b/desktop/extensions.md @@ -8,7 +8,7 @@ toc_max: 2 > **Beta** > -> The Docker Extensions feature is currently in [Beta](../release-lifecycle.md#beta). We recommend that you do not use Extensions in production environments. +> The Docker Extensions feature is currently in [Beta](../release-lifecycle.md#beta). We recommend that you do not use Docker Extensions in production environments. Docker Extensions lets you use third-party tools within Docker Desktop to extend its functionality. There is no limit to the number of extensions you can install. diff --git a/desktop/images/extensions-marketplace.PNG b/desktop/images/extensions-marketplace.PNG index 5f6445ecee..a849441026 100644 Binary files a/desktop/images/extensions-marketplace.PNG and b/desktop/images/extensions-marketplace.PNG differ diff --git a/desktop/settings/linux.md b/desktop/settings/linux.md index b77081a366..65ad76adc0 100644 --- a/desktop/settings/linux.md +++ b/desktop/settings/linux.md @@ -20,6 +20,8 @@ On the **General** tab, you can configure when to start Docker and specify other - **Choose Theme for Docker Desktop**. Choose whether you want to apply a **Light** or **Dark** theme to Docker Desktop. Alternatively you can set Docker Desktop to **Use System Settings**. +- **Use integrated container terminal**. Select to execute commands in a running container straight from the Docker Dashboard. For more information, see [Explore containers](../use-desktop/container.md) + - **Send usage statistics**. Select so Docker Desktop sends diagnostics, crash reports, and usage data. This information helps Docker improve and troubleshoot the application. Clear the check box to opt out. Docker may diff --git a/desktop/settings/mac.md b/desktop/settings/mac.md index f6e7e8d34c..995db4532e 100644 --- a/desktop/settings/mac.md +++ b/desktop/settings/mac.md @@ -25,6 +25,8 @@ On the **General** tab, you can configure when to start Docker and specify other - **Choose Theme for Docker Desktop**. Choose whether you want to apply a **Light** or **Dark** theme to Docker Desktop. Alternatively you can set Docker Desktop to **Use System Settings**. +- **Use integrated container terminal**. Select to execute commands in a running container straight from the Docker Dashboard. For more information, see [Explore containers](../use-desktop/container.md). + - **Include VM in Time Machine backups**. Select to back up the Docker Desktop virtual machine. This option is disabled by default. diff --git a/desktop/settings/windows.md b/desktop/settings/windows.md index 1b50b2cf4e..03f7bc7e45 100644 --- a/desktop/settings/windows.md +++ b/desktop/settings/windows.md @@ -20,6 +20,8 @@ On the **General** tab, you can configure when to start Docker and specify other - **Choose Theme for Docker Desktop**. Choose whether you want to apply a **Light** or **Dark** theme to Docker Desktop. Alternatively you can set Docker Desktop to **Use System Settings**. +- **Use integrated container terminal**. Select to execute commands in a running container straight from the Docker Dashboard. For more information, see [Explore containers](../use-desktop/container.md). + - **Expose daemon on tcp://localhost:2375 without TLS**. Check this option to enable legacy clients to connect to the Docker daemon. You must use this option with caution as exposing the daemon without TLS can result in remote code diff --git a/desktop/use-desktop/container.md b/desktop/use-desktop/container.md index 41d62476bb..ca6714df3c 100644 --- a/desktop/use-desktop/container.md +++ b/desktop/use-desktop/container.md @@ -21,6 +21,20 @@ When you hover over individual containers, you can also: - Click **Open in Visual Studio Code** to open the application in VS Code. - Open the port exposed by the container in a browser. +### Integrated terminal + +You also have the option to open an integrated terminal, on a running container, directly within Docker Desktop. This allows you to quickly execute commands within your container so you can understand its current state or debug when something goes wrong. + +Using the integrated terminal is the same as running `docker exec -it /bin/sh`, or `docker exec -it cmd.exe` if you are using Windows containers, in your external terminal. It also: + +- Automatically detects the default user for a running container from the image's Dockerfile. If no use is specified it defaults to `root`. +- Persists your session if you navigate to another part of the Docker Dashboard and then return. +- Supports copy, paste, search, and clearing your session. + +To open the integrated terminal, hover over your running container and select the **Show container actions** menu. From the dropdown menu, select **Open in terminal**. + + To use your external terminal, change your settings. + ## Inspect a container You can obtain detailed information about the container when you select a container.