diff --git a/_releaser/Dockerfile b/_releaser/Dockerfile index 5b945dd596a6..9d15b86c4fb0 100644 --- a/_releaser/Dockerfile +++ b/_releaser/Dockerfile @@ -5,7 +5,7 @@ ARG GO_VERSION=1.19 FROM scratch AS sitedir FROM golang:${GO_VERSION}-alpine AS base -RUN apk add --no-cache jq openssl +RUN apk add --no-cache openssl ENV CGO_ENABLED=0 WORKDIR /src COPY go.mod go.sum ./ @@ -49,6 +49,6 @@ RUN --mount=type=bind,target=. \ --mount=type=secret,id=AWS_SECRET_ACCESS_KEY \ --mount=type=secret,id=AWS_SESSION_TOKEN \ AWS_LAMBDA_FUNCTION_FILE=cloudfront-lambda-redirects.js \ - REDIRECTS_JSON=$(jq -c '.' /site/redirects.json) \ - REDIRECTS_PREFIXES_JSON=$(jq -c '.' redirects-prefixes.json) \ + REDIRECTS_FILE="/site/redirects.json" \ + REDIRECTS_PREFIXES_FILE="redirects-prefixes.json" \ releaser aws cloudfront-update diff --git a/_releaser/aws.go b/_releaser/aws.go index 3f79c2bd2e45..5e1714310e38 100644 --- a/_releaser/aws.go +++ b/_releaser/aws.go @@ -98,17 +98,17 @@ func (s *AwsLambdaInvokeCmd) Run() error { type AwsCloudfrontUpdateCmd struct { Region string `kong:"name='region',env='AWS_REGION'"` Function string `kong:"name='lambda-function',env='AWS_LAMBDA_FUNCTION'"` - FunctionFile string `kong:"name='lambda-function-file',env='AWS_LAMBDA_FUNCTION_FILE'"` + FunctionFile string `kong:"name='lambda-function-file',env='AWS_LAMBDA_FUNCTION_FILE',type=filecontent"` CloudfrontID string `kong:"name='cloudfront-id',env='AWS_CLOUDFRONT_ID'"` - RedirectsJSON string `kong:"name='redirects-json',env='REDIRECTS_JSON'"` - RedirectsPrefixesJSON string `kong:"name='redirects-prefixes-json',env='REDIRECTS_PREFIXES_JSON'"` + RedirectsFile string `kong:"name='redirects-file',env='REDIRECTS_FILE',type=filecontent"` + RedirectsPrefixesFile string `kong:"name='redirects-prefixes-file',env='REDIRECTS_PREFIXES_FILE',type=filecontent"` } func (s *AwsCloudfrontUpdateCmd) Run() error { var err error ver := time.Now().UTC().Format(time.RFC3339) - zipdt, err := getLambdaFunctionZip(s.FunctionFile, s.RedirectsJSON, s.RedirectsPrefixesJSON) + zipdt, err := getLambdaFunctionZip(s.FunctionFile, s.RedirectsFile, s.RedirectsPrefixesFile) if err != nil { return fmt.Errorf("cannot create lambda function zip: %w", err) } @@ -228,20 +228,15 @@ func (s *AwsCloudfrontUpdateCmd) Run() error { return nil } -func getLambdaFunctionZip(funcFilename string, redirectsJSON string, redirectsPrefixesJSON string) ([]byte, error) { - funcdt, err := os.ReadFile(funcFilename) - if err != nil { - return nil, fmt.Errorf("failed to read lambda function file %q: %w", funcFilename, err) - } - +func getLambdaFunctionZip(funcdt, redirects, redirectsPrefixes string) ([]byte, error) { var funcbuf bytes.Buffer - functpl := template.Must(template.New("").Parse(string(funcdt))) - if err = functpl.Execute(&funcbuf, struct { + functpl := template.Must(template.New("").Parse(funcdt)) + if err := functpl.Execute(&funcbuf, struct { RedirectsJSON string RedirectsPrefixesJSON string }{ - redirectsJSON, - redirectsPrefixesJSON, + redirects, + redirectsPrefixes, }); err != nil { return nil, err } diff --git a/content/get-started/get-docker.md b/content/get-started/get-docker.md index 321ea0dff90c..508c00f3ee9f 100644 --- a/content/get-started/get-docker.md +++ b/content/get-started/get-docker.md @@ -34,7 +34,7 @@ section and choose the best installation path for you. {{< card title="Docker Desktop for Mac" description="A native application using the macOS sandbox security model that delivers all Docker tools to your Mac." - link="/desktop/install/mac-install/" + link="/desktop/setup/install/mac-install/" icon="/assets/images/apple_48.svg" >}}
@@ -42,7 +42,7 @@ section and choose the best installation path for you. {{< card title="Docker Desktop for Windows" description="A native Windows application that delivers all Docker tools to your Windows computer." - link="/desktop/install/windows-install/" + link="/desktop/setup/install/windows-install/" icon="/assets/images/windows_48.svg" >}}
diff --git a/content/get-started/introduction/get-docker-desktop.md b/content/get-started/introduction/get-docker-desktop.md index eb796ff0fb49..5411cd61ac48 100644 --- a/content/get-started/introduction/get-docker-desktop.md +++ b/content/get-started/introduction/get-docker-desktop.md @@ -28,14 +28,14 @@ This guide will walk you through the installation process, enabling you to exper {{< card title="Docker Desktop for Mac" - description="[Download (Apple Silicon)](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64) | [Download (Intel)](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64) | [Install instructions](/desktop/install/mac-install)" + description="[Download (Apple Silicon)](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64) | [Download (Intel)](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64) | [Install instructions](/desktop/setup/install/mac-install)" icon="/assets/images/apple_48.svg" >}}
{{< card title="Docker Desktop for Windows" - description="[Download](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-windows) | [Install instructions](/desktop/install/windows-install)" + description="[Download](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-windows) | [Install instructions](/desktop/setup/install/windows-install)" icon="/assets/images/windows_48.svg" >}}
diff --git a/content/get-started/workshop/05_persisting_data.md b/content/get-started/workshop/05_persisting_data.md index fb1b925deca8..60b0e17c2b76 100644 --- a/content/get-started/workshop/05_persisting_data.md +++ b/content/get-started/workshop/05_persisting_data.md @@ -114,7 +114,7 @@ You can create the volume and start the container using the CLI or Docker Deskto > ``` > > For more details about Git Bash's syntax differences, see - > [Working with Git Bash](/desktop/troubleshoot/topics/#working-with-git-bash). + > [Working with Git Bash](/desktop/troubleshoot-and-support/troubleshoot/topics/#working-with-git-bash). {{< /tab >}} diff --git a/content/get-started/workshop/06_bind_mounts.md b/content/get-started/workshop/06_bind_mounts.md index 8a825759c73c..70539a3e37db 100644 --- a/content/get-started/workshop/06_bind_mounts.md +++ b/content/get-started/workshop/06_bind_mounts.md @@ -50,7 +50,7 @@ work. 1. Verify that your `getting-started-app` directory is in a directory defined in Docker Desktop's file sharing setting. This setting defines which parts of your -filesystem you can share with containers. For details about accessing the setting, see [File sharing](/manuals/desktop/settings.md#file-sharing). +filesystem you can share with containers. For details about accessing the setting, see [File sharing](/manuals/desktop/settings-and-maintenance/settings.md#file-sharing). 2. Open a terminal and change directory to the `getting-started-app` directory. diff --git a/content/guides/language-translation.md b/content/guides/language-translation.md index f71c46e7a2ae..64ad491c935f 100644 --- a/content/guides/language-translation.md +++ b/content/guides/language-translation.md @@ -315,7 +315,7 @@ To run the application using Docker: > > For Windows users, you may get an error when running the container. Verify > that the line endings in the `entrypoint.sh` are `LF` (`\n`) and not `CRLF` (`\r\n`), - > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). + > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot-and-support/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). You will see the following in your console after the container starts. diff --git a/content/guides/named-entity-recognition.md b/content/guides/named-entity-recognition.md index 916810166b06..8c5e087c072b 100644 --- a/content/guides/named-entity-recognition.md +++ b/content/guides/named-entity-recognition.md @@ -318,7 +318,7 @@ To run the application using Docker: > > For Windows users, you may get an error when running the container. Verify > that the line endings in the `entrypoint.sh` are `LF` (`\n`) and not `CRLF` (`\r\n`), - > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). + > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot-and-support/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). You will see the following in your console after the container starts. diff --git a/content/guides/rust/develop.md b/content/guides/rust/develop.md index d1baae4c19b2..462fc229deb2 100644 --- a/content/guides/rust/develop.md +++ b/content/guides/rust/develop.md @@ -12,7 +12,7 @@ aliases: ## Prerequisites - You have installed the latest version of [Docker Desktop](/get-started/get-docker.md). -- You have completed the walkthroughs in the Docker Desktop [Learning Center](/manuals/desktop/get-started.md) to learn about Docker concepts. +- You have completed the walkthroughs in the Docker Desktop [Learning Center](/manuals/desktop/use-desktop/_index.md) to learn about Docker concepts. - You have a [git client](https://git-scm.com/downloads). The examples in this section use a command-line based git client, but you can use any client. ## Overview diff --git a/content/guides/sentiment-analysis.md b/content/guides/sentiment-analysis.md index 751b4c4cd22b..ea6f5ab5a413 100644 --- a/content/guides/sentiment-analysis.md +++ b/content/guides/sentiment-analysis.md @@ -331,7 +331,7 @@ To run the application using Docker: > > For Windows users, you may get an error when running the container. Verify > that the line endings in the `entrypoint.sh` are `LF` (`\n`) and not `CRLF` (`\r\n`), - > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). + > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot-and-support/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). You will see the following in your console after the container starts. diff --git a/content/guides/text-classification.md b/content/guides/text-classification.md index a7fbe2749208..6c3e6ee4a8fe 100644 --- a/content/guides/text-classification.md +++ b/content/guides/text-classification.md @@ -390,7 +390,7 @@ To run the application using Docker: > > For Windows users, you may get an error when running the container. Verify > that the line endings in the `entrypoint.sh` are `LF` (`\n`) and not `CRLF` (`\r\n`), - > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). + > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot-and-support/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). You will see the following in your console after the container starts. diff --git a/content/guides/text-summarization.md b/content/guides/text-summarization.md index 4478fb6dd869..ef6cbd290dfb 100644 --- a/content/guides/text-summarization.md +++ b/content/guides/text-summarization.md @@ -324,7 +324,7 @@ To run the application using Docker: > > For Windows users, you may get an error when running the container. Verify > that the line endings in the `entrypoint.sh` are `LF` (`\n`) and not `CRLF` (`\r\n`), - > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). + > then rebuild the image. For more details, see [Avoid unexpected syntax errors, use Unix style line endings for files in containers](/desktop/troubleshoot-and-support/troubleshoot/topics/#avoid-unexpected-syntax-errors-use-unix-style-line-endings-for-files-in-containers). You will see the following in your console after the container starts. diff --git a/content/manuals/accounts/create-account.md b/content/manuals/accounts/create-account.md index 1780b4ec1381..fc9532b58607 100644 --- a/content/manuals/accounts/create-account.md +++ b/content/manuals/accounts/create-account.md @@ -90,4 +90,8 @@ To reset your password, enter your email address on the [Sign in](https://login. ## Troubleshooting -For support and troubleshooting information, see [Get support](../support.md). +If you have a paid Docker subscription, you can [contact the Support team](https://hub.docker.com/support/contact/). + +All Docker users can seek troubleshooting information and support through the following resources, where Docker or the community respond on a best effort basis. + - [Docker Community Forums](https://forums.docker.com/) + - [Docker Community Slack](http://dockr.ly/comm-slack) diff --git a/content/manuals/build/builders/manage.md b/content/manuals/build/builders/manage.md index 306ed098df49..5039fa18e5ed 100644 --- a/content/manuals/build/builders/manage.md +++ b/content/manuals/build/builders/manage.md @@ -123,4 +123,4 @@ It only removes your connection to the builder. If you have turned on the [Docker Desktop Builds view](/manuals/desktop/use-desktop/builds.md), -you can inspect builders in [Docker Desktop settings](/manuals/desktop/settings.md#builders). +you can inspect builders in [Docker Desktop settings](/manuals/desktop/settings-and-maintenance/settings.md#builders). diff --git a/content/manuals/compose/how-tos/multiple-compose-files/merge.md b/content/manuals/compose/how-tos/multiple-compose-files/merge.md index da8120705b8f..360d73d24756 100644 --- a/content/manuals/compose/how-tos/multiple-compose-files/merge.md +++ b/content/manuals/compose/how-tos/multiple-compose-files/merge.md @@ -10,8 +10,8 @@ aliases: Docker Compose lets you merge and override a set of Compose files together to create a composite Compose file. -By default, Compose reads two files, a `compose.yml` and an optional -`compose.override.yml` file. By convention, the `compose.yml` +By default, Compose reads two files, a `compose.yaml` and an optional +`compose.override.yaml` file. By convention, the `compose.yaml` contains your base configuration. The override file can contain configuration overrides for existing services or entirely new services. @@ -32,10 +32,10 @@ add to their predecessors. For example: ```console -$ docker compose -f compose.yml -f compose.admin.yml run backup_db +$ docker compose -f compose.yaml -f compose.admin.yaml run backup_db ``` -The `compose.yml` file might specify a `webapp` service. +The `compose.yaml` file might specify a `webapp` service. ```yaml webapp: @@ -46,7 +46,7 @@ webapp: - "/data" ``` -The `compose.admin.yml` may also specify this same service: +The `compose.admin.yaml` may also specify this same service: ```yaml webapp: @@ -226,7 +226,7 @@ For more merging rules, see [Merge and override](/reference/compose-file/merge.m ### Additional information -- Using `-f` is optional. If not provided, Compose searches the working directory and its parent directories for a `compose.yml` and a `compose.override.yml` file. You must supply at least the `compose.yml` file. If both files exist on the same directory level, Compose combines them into a single configuration. +- Using `-f` is optional. If not provided, Compose searches the working directory and its parent directories for a `compose.yaml` and a `compose.override.yaml` file. You must supply at least the `compose.yaml` file. If both files exist on the same directory level, Compose combines them into a single configuration. - You can use a `-f` with `-` (dash) as the filename to read the configuration from `stdin`. For example: ```console @@ -246,12 +246,12 @@ For more merging rules, see [Merge and override](/reference/compose-file/merge.m - You can use the `-f` flag to specify a path to a Compose file that is not located in the current directory, either from the command line or by setting up a [COMPOSE_FILE environment variable](../environment-variables/envvars.md#compose_file) in your shell or in an environment file. - For example, if you are running the [Compose Rails sample](https://github.com/docker/awesome-compose/tree/master/official-documentation-samples/rails/README.md), and have a `compose.yml` file in a directory called `sandbox/rails`. You can use a command like [docker compose pull](/reference/cli/docker/compose/pull.md) to get the postgres image for the `db` service from anywhere by using the `-f` flag as follows: `docker compose -f ~/sandbox/rails/compose.yml pull db` + For example, if you are running the [Compose Rails sample](https://github.com/docker/awesome-compose/tree/master/official-documentation-samples/rails/README.md), and have a `compose.yaml` file in a directory called `sandbox/rails`. You can use a command like [docker compose pull](/reference/cli/docker/compose/pull.md) to get the postgres image for the `db` service from anywhere by using the `-f` flag as follows: `docker compose -f ~/sandbox/rails/compose.yaml pull db` Here's the full example: ```console - $ docker compose -f ~/sandbox/rails/compose.yml pull db + $ docker compose -f ~/sandbox/rails/compose.yaml pull db Pulling db (postgres:latest)... latest: Pulling from library/postgres ef0380f84d05: Pull complete @@ -281,7 +281,7 @@ a few different files: Start with a base file that defines the canonical configuration for the services. -`compose.yml` +`compose.yaml` ```yaml services: @@ -301,7 +301,7 @@ services: In this example the development configuration exposes some ports to the host, mounts our code as a volume, and builds the web image. -`compose.override.yml` +`compose.override.yaml` ```yaml services: @@ -329,7 +329,7 @@ When you run `docker compose up` it reads the overrides automatically. To use this Compose app in a production environment, another override file is created, which might be stored in a different git repository or managed by a different team. -`compose.prod.yml` +`compose.prod.yaml` ```yaml services: @@ -347,12 +347,12 @@ services: To deploy with this production Compose file you can run ```console -$ docker compose -f compose.yml -f compose.prod.yml up -d +$ docker compose -f compose.yaml -f compose.prod.yaml up -d ``` This deploys all three services using the configuration in -`compose.yml` and `compose.prod.yml` but not the -dev configuration in `compose.override.yml`. +`compose.yaml` and `compose.prod.yaml` but not the +dev configuration in `compose.override.yaml`. For more information, see [Using Compose in production](../production.md). diff --git a/content/manuals/compose/install/_index.md b/content/manuals/compose/install/_index.md index f96f7a9f847b..f6d401d5edd5 100644 --- a/content/manuals/compose/install/_index.md +++ b/content/manuals/compose/install/_index.md @@ -24,9 +24,9 @@ The easiest and recommended way to get Docker Compose is to install Docker Deskt includes Docker Compose along with Docker Engine and Docker CLI which are Compose prerequisites. Docker Desktop is available on: -- [Linux](/manuals/desktop/install/linux/_index.md) -- [Mac](/manuals/desktop/install/mac-install.md) -- [Windows](/manuals/desktop/install/windows-install.md) +- [Linux](/manuals/desktop/setup/install/linux/_index.md) +- [Mac](/manuals/desktop/setup/install/mac-install.md) +- [Windows](/manuals/desktop/setup/install/windows-install.md) If you have already installed Docker Desktop, you can check which version of Compose you have by selecting **About Docker Desktop** from the Docker menu {{< inline-image src="../../desktop/images/whale-x.svg" alt="whale menu" >}}. @@ -41,7 +41,7 @@ If you have already installed Docker Desktop, you can check which version of Com > $ sudo rm /usr/local/bin/docker-compose > $ sudo ln -s /Applications/Docker.app/Contents/Resources/cli-plugins/docker-compose /usr/local/bin/docker-compose > ``` -> Or enable [Automatically check configuration](/desktop/settings/) which will detect and fix it for you. +> Or enable [Automatically check configuration](/manuals/desktop/settings-and-maintenance/settings.md) which will detect and fix it for you. ### Scenario two: Install the Compose plugin diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index ccf4f263a7a8..35d3394a9935 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -3848,7 +3848,7 @@ The highlights: This means the GitHub repository has moved to [https://github.com/docker/fig](https://github.com/docker/fig) and our IRC channel is now #docker-fig on Freenode. - - Fig can be used with the [official Docker OS X installer](/manuals/desktop/install/mac-install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected. + - Fig can be used with the [official Docker OS X installer](/manuals/desktop/setup/install/mac-install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected. - Fig supports Docker 1.3. diff --git a/content/manuals/desktop/_index.md b/content/manuals/desktop/_index.md index cb1957d25e62..4c2eeea375e4 100644 --- a/content/manuals/desktop/_index.md +++ b/content/manuals/desktop/_index.md @@ -9,8 +9,8 @@ grid: - title: Install Docker Desktop description: | Install Docker Desktop on - [Mac](/desktop/install/mac-install/), - [Windows](/desktop/install/windows-install/), or + [Mac](/desktop/setup/install/mac-install/), + [Windows](/desktop/setup/install/windows-install/), or [Linux](/desktop/install/linux/). icon: download - title: Explore Docker Desktop @@ -24,7 +24,7 @@ grid: - title: Browse common FAQs description: Explore general FAQs or FAQs for specific platforms. icon: help - link: /desktop/faqs/ + link: /desktop/troubleshoot-and-support/faqs/general/ - title: Find additional resources description: | Find information on networking features, deploying on Kubernetes, and more. @@ -33,7 +33,7 @@ grid: - title: Give feedback description: Provide feedback on Docker Desktop or Docker Desktop features. icon: sms - link: /desktop/feedback/ + link: /desktop/troubleshoot-and-support/feedback/ aliases: - /desktop/opensource/ - /docker-for-mac/dashboard/ diff --git a/content/manuals/desktop/networking.md b/content/manuals/desktop/networking.md index f743884951d0..d3243859b947 100644 --- a/content/manuals/desktop/networking.md +++ b/content/manuals/desktop/networking.md @@ -46,7 +46,7 @@ syntax for `-p` is `HOST_PORT:CLIENT_PORT`. ### HTTP/HTTPS Proxy support -See [Proxies](/manuals/desktop/settings.md#proxies) +See [Proxies](/manuals/desktop/settings-and-maintenance/settings.md#proxies) ### SOCKS5 proxy support diff --git a/content/manuals/desktop/previous-versions/2.x-windows.md b/content/manuals/desktop/previous-versions/2.x-windows.md index 3db8701020ad..8a3b5d11f54b 100644 --- a/content/manuals/desktop/previous-versions/2.x-windows.md +++ b/content/manuals/desktop/previous-versions/2.x-windows.md @@ -189,7 +189,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### New -- Windows 10 Home users can now use Docker Desktop through WSL 2. This requires Windows 10, version 2004 or higher. For more information, see [Install Docker Desktop on Windows](../install/windows-install.md). +- Windows 10 Home users can now use Docker Desktop through WSL 2. This requires Windows 10, version 2004 or higher. For more information, see [Install Docker Desktop on Windows](/manuals/desktop/setup/install/windows-install.md). - Docker Desktop introduces a new onboarding tutorial upon first startup. The Quick Start tutorial guides users to get started with Docker in a few easy steps. It includes a simple exercise to build an example Docker image, run it as a container, push and save the image to Docker Hub. - Docker Desktop now allows sharing individual folders, rather than whole drives, giving more control to users over what is being shared. @@ -318,7 +318,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus - Fixed a race condition when starting the WSL engine which caused Docker Desktop to incorrectly report that the containers have exited. Fixes [docker/for-win#5607](https://github.com/docker/for-win/issues/5607). - Fixed an issue where editing code inside a container resulted in an error. Fixes [docker/for-win#5528](https://github.com/docker/for-win/issues/5528). - Fixed a bug where running the command `DockerCli.exe -SharedDrives` failed to display a list of drives that are shared. Fixes [docker/for-win#5625](https://github.com/docker/for-win/issues/5625). -- Starting with Docker Desktop 2.2.0.3, you must access all shared files using their original case. For example, if you have created a file called `test`, you must open it as `test`. Attempts to open the file as `Test` will fail with the error `No such file or directory`. For more information, see _Tips on shared drives, permissions, and volume mounts_ in [File sharing](/manuals/desktop/settings.md#file-sharing). +- Starting with Docker Desktop 2.2.0.3, you must access all shared files using their original case. For example, if you have created a file called `test`, you must open it as `test`. Attempts to open the file as `Test` will fail with the error `No such file or directory`. For more information, see _Tips on shared drives, permissions, and volume mounts_ in [File sharing](/manuals/desktop/settings-and-maintenance/settings.md#file-sharing). ### Known issues diff --git a/content/manuals/desktop/previous-versions/3.x-mac.md b/content/manuals/desktop/previous-versions/3.x-mac.md index 1dfddfc554fc..25491a7e57a1 100644 --- a/content/manuals/desktop/previous-versions/3.x-mac.md +++ b/content/manuals/desktop/previous-versions/3.x-mac.md @@ -202,7 +202,7 @@ This page contains release notes for Docker Desktop for Mac 3.x. ### New -Docker Desktop is now available for Apple silicon as well as Intel chips. This enables developers with their choice of local development environments, and extends development pipelines for ARM-based applications. For more information, see [Docker Desktop for Apple silicon](../install/mac-install.md). +Docker Desktop is now available for Apple silicon as well as Intel chips. This enables developers with their choice of local development environments, and extends development pipelines for ARM-based applications. For more information, see [Docker Desktop for Apple silicon](/manuals/desktop/setup/install/mac-install.md). ### Bug fixes and minor changes diff --git a/content/manuals/desktop/previous-versions/edge-releases-mac.md b/content/manuals/desktop/previous-versions/edge-releases-mac.md index 0a17922e4752..ed99dc819628 100644 --- a/content/manuals/desktop/previous-versions/edge-releases-mac.md +++ b/content/manuals/desktop/previous-versions/edge-releases-mac.md @@ -12,7 +12,7 @@ sitemap: false This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release. For Docker Desktop system requirements, see -[What to know before you install](../install/mac-install.md#system-requirements). +[What to know before you install](/manuals/desktop/setup/install/mac-install.md#system-requirements). ## Docker Desktop Community 2.5.4 2020-12-07 @@ -1560,9 +1560,9 @@ TCP connection is idle for more than five minutes (related to **New** -- Dedicated preference pane for advanced configuration of the docker daemon (edit daemon.json). See [Daemon Advanced (JSON configuration file)](/manuals/desktop/settings.md#docker-engine). +- Dedicated preference pane for advanced configuration of the docker daemon (edit daemon.json). See [Daemon Advanced (JSON configuration file)](/manuals/desktop/settings-and-maintenance/settings.md#docker-engine). -- Docker Experimental mode can be toggled. See [Daemon Basic (experimental mode and registries)](/manuals/desktop/settings.md#docker-engine). +- Docker Experimental mode can be toggled. See [Daemon Basic (experimental mode and registries)](/manuals/desktop/settings-and-maintenance/settings.md#docker-engine). **Upgrades** @@ -1718,7 +1718,7 @@ issue is being investigated. The workaround is to restart Docker.app. traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory trees, may suffer from poor performance. More information is -available in [Known Issues](../troubleshoot/known-issues.md) in Troubleshooting. +available in [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md) in Troubleshooting. * Under some unhandled error conditions, `inotify` event delivery can fail and become permanently disabled. The workaround is to restart `Docker.app`. @@ -1748,7 +1748,7 @@ with `osxfs`. In particular, writes of small blocks and traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory trees, may suffer from poor performance. More information is available in -[Known Issues](../troubleshoot/known-issues.md) in Troubleshooting. +[Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md) in Troubleshooting. * Under some unhandled error conditions, `inotify` event delivery can fail and become permanently disabled. The workaround is to restart Docker.app. @@ -1782,7 +1782,7 @@ trees, may suffer from poor performance. More information is available in * There are a number of issues with the performance of directories bind-mounted with `osxfs`. In particular, writes of small blocks and traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory -trees, may suffer from poor performance. For more information and workarounds, see the bullet on performance of bind-mounted directories in [Known Issues](../troubleshoot/known-issues.md) in Troubleshooting. +trees, may suffer from poor performance. For more information and workarounds, see the bullet on performance of bind-mounted directories in [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md) in Troubleshooting. * Under some unhandled error conditions, `inotify` event delivery can fail and become permanently disabled. The workaround is to restart `Docker.app`. @@ -1808,7 +1808,7 @@ trees, may suffer from poor performance. For more information and workarounds, s * Docker.app sometimes uses 200% CPU after macOS wakes up from sleep mode. The issue is being investigated. The workaround is to restart Docker.app -* There are a number of issues with the performance of directories bind-mounted with `osxfs`. In particular, writes of small blocks and traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory trees, may suffer from poor performance. For more information and workarounds, see the bullet on performance of bind-mounted directories in [Known Issues](../troubleshoot/known-issues.md) in Troubleshooting. +* There are a number of issues with the performance of directories bind-mounted with `osxfs`. In particular, writes of small blocks and traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory trees, may suffer from poor performance. For more information and workarounds, see the bullet on performance of bind-mounted directories in [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md) in Troubleshooting. * Under some unhandled error conditions, `inotify` event delivery can fail and become permanently disabled. The workaround is to restart Docker.app @@ -1831,7 +1831,7 @@ trees, may suffer from poor performance. For more information and workarounds, s * Docker.app sometimes uses 200% CPU after macOS wakes up from sleep mode. The issue is being investigated. The workaround is to restart Docker.app -* There are a number of issues with the performance of directories bind-mounted with `osxfs`. In particular, writes of small blocks and traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory trees, may suffer from poor performance. More information is available in [Known Issues](../troubleshoot/known-issues.md). +* There are a number of issues with the performance of directories bind-mounted with `osxfs`. In particular, writes of small blocks and traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory trees, may suffer from poor performance. More information is available in [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). * Under some unhandled error conditions, `inotify` event delivery can fail and become permanently disabled. The workaround is to restart Docker.app @@ -1855,7 +1855,7 @@ events or unexpected unmounts. **New** -* Docker for Mac is now available from 2 channels: **stable** and **beta**. New features and bug fixes will go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [installation guide](../install/mac-install.md). +* Docker for Mac is now available from 2 channels: **stable** and **beta**. New features and bug fixes will go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker Engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [installation guide](/manuals/desktop/setup/install/mac-install.md). **Upgrades** @@ -1878,7 +1878,7 @@ events or unexpected unmounts. * Docker.app sometimes uses 200% CPU after macOS wakes up from sleep mode. The issue is being investigated. The workaround is to restart Docker.app -* There are a number of issues with the performance of directories bind-mounted with `osxfs`. In particular, writes of small blocks, and traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory trees, may suffer from poor performance. For more information and workarounds, see [Known Issues](../troubleshoot/known-issues.md) in [Logs and Troubleshooting](../troubleshoot/_index.md). +* There are a number of issues with the performance of directories bind-mounted with `osxfs`. In particular, writes of small blocks, and traversals of large directories are currently slow. Additionally, containers that perform large numbers of directory operations, such as repeated scans of large directory trees, may suffer from poor performance. For more information and workarounds, see [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md) in [Logs and Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md). * Under some unhandled error conditions, `inotify` event delivery can fail and become permanently disabled. The workaround is to restart Docker.app @@ -1922,7 +1922,7 @@ events or unexpected unmounts. **Known issues** -* See [Known Issues](../troubleshoot/known-issues.md). +* See [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). ### Beta 18.1 Release Notes (2016-07-07 1.12.0-rc3-beta18.1) @@ -1948,7 +1948,7 @@ events or unexpected unmounts. **Known issues** -* See [Known Issues](../troubleshoot/known-issues.md). +* See [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). ### Beta 18 Release Notes (2016-07-06 1.12.0-rc3-beta18) @@ -1969,7 +1969,7 @@ events or unexpected unmounts. **Known issues** -* See [Known Issues](../troubleshoot/known-issues.md). +* See [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). ### Beta 17 Release Notes (2016-06-29 1.12.0-rc2-beta17) @@ -1988,7 +1988,7 @@ events or unexpected unmounts. **Known issues** -* See [Known Issues](../troubleshoot/known-issues.md). +* See [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). ### Beta 16 Release Notes (2016-06-17 1.12.0-rc2-beta16) @@ -2010,7 +2010,7 @@ events or unexpected unmounts. **Known issues** -* See [Known Issues](../troubleshoot/known-issues.md). +* See [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). ### Beta 15 Release Notes (2016-06-10 1.11.2-beta15) @@ -2034,7 +2034,7 @@ events or unexpected unmounts. **Known issues** -* See [Known Issues](../troubleshoot/known-issues.md). +* See [Known Issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). ### Beta 14 Release Notes (2016-06-02 1.11.1-beta14) diff --git a/content/manuals/desktop/previous-versions/edge-releases-windows.md b/content/manuals/desktop/previous-versions/edge-releases-windows.md index 537b2b5d0bee..ad0d9393fa30 100644 --- a/content/manuals/desktop/previous-versions/edge-releases-windows.md +++ b/content/manuals/desktop/previous-versions/edge-releases-windows.md @@ -12,7 +12,7 @@ sitemap: false This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release. For Docker Desktop system requirements, see -[What to know before you install](../install/windows-install.md#system-requirements). +[What to know before you install](/manuals/desktop/setup/install/windows-install.md#system-requirements). ## Docker Desktop Community 2.5.4 2020-12-07 @@ -1723,7 +1723,7 @@ registry access (fixes [docker/for-win#569](https://github.com/docker/for-win/is **New** - Windows containers settings panel and options are working. In previous releases, settings were not implemented for -[Windows containers mode](../faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). +[Windows containers mode](/manuals/desktop/troubleshoot-and-support/faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). - Windows containers: Restart from the settings panel works - Windows containers: Factory default - Windows containers: `Daemon.json` can be modified @@ -1992,7 +1992,7 @@ work. Some insider builds may not work. **Known issues** * Only UTF-8 passwords are supported for host filesystem sharing -* Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc` as documented in [Troubleshooting](../troubleshoot/known-issues.md). +* Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc` as documented in [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). ### Beta 22 Release (2016-08-11 1.12.0-beta22) @@ -2000,13 +2000,13 @@ Unreleased. See Beta 23 for changes. **Known issues** -* Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc` as documented in [Troubleshooting](../troubleshoot/known-issues.md). +* Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc` as documented in [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). ### Beta 21 Release (2016-07-28 1.12.0-beta21) **New** -* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see [Install Docker Desktop on Windows](../install/windows-install.md). +* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker Engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see [Install Docker Desktop on Windows](/manuals/desktop/setup/install/windows-install.md). * Removed the docker host name. Containers with exported ports are reachable via localhost. @@ -2275,7 +2275,7 @@ This Beta release includes some significant changes: * The GUI now runs in non-elevated mode and connects to an elevated Windows service * Allocate virtual machine memory by 256 MB increments, instead of 1 GB * Show a meaningful error when the user has an empty password -* Improved [Troubleshooting](../troubleshoot/_index.md) page +* Improved [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) page **Upgrades** @@ -2299,7 +2299,7 @@ This Beta release includes some significant changes: **Known issues** -* Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed. See [Troubleshooting](../troubleshoot/known-issues.md) for more details. +* Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed. See [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md) for more details. * Logs for the windows service are not aggregated with logs from the GUI. This is expected to be fixed in future versions. @@ -2327,7 +2327,7 @@ This Beta release includes some significant changes: **Known issues** -* Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed. See [Troubleshooting](../troubleshoot/_index.md) for more details. +* Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed. See [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) for more details. ### Beta 9 Release (2016-04-26 1.11.0-beta9) diff --git a/content/manuals/desktop/release-notes.md b/content/manuals/desktop/release-notes.md index 7656dbbcc272..4a99b03bcc3a 100644 --- a/content/manuals/desktop/release-notes.md +++ b/content/manuals/desktop/release-notes.md @@ -17,7 +17,7 @@ aliases: weight: 220 --- -This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/releases.md). +This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. For frequently asked questions about Docker Desktop releases, see [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/releases.md). Docker Desktop versions older than 6 months from the latest release are not available for download. Previous release notes are available in our [documentation repository](https://github.com/docker/docs/tree/main/content/manuals/desktop/previous-versions). @@ -41,7 +41,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec ### New -- Support for [Docker Desktop on Red Hat Enterprise Linux](/manuals/desktop/install/linux/rhel.md) is now generally available. +- Support for [Docker Desktop on Red Hat Enterprise Linux](/manuals/desktop/setup/install/linux/rhel.md) is now generally available. - Volume Backup and Share is now generally available and can be found in the **Volumes** view. - Terminal support within Docker Desktop using system shells is now generally available. - Beta release of Docker VMM - the more performant alternative to Apple Virtualization Framework on macOS (requires Apple Silicon and macOS 12.5 or later). @@ -165,7 +165,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec - [Host networking](/manuals/engine/network/drivers/host.md#docker-desktop) support on Docker Desktop is now generally available. - If you authenticate via the CLI, you can now authenticate through a browser-based flow, removing the need for manual PAT generation. - Windows now supports automatic reclamation of disk space in Docker Desktop for WSL2 installations [using a managed virtual hard disk](/manuals/desktop/wsl/best-practices.md). -- Deploying Docker Desktop via the [MSI installer](/manuals/desktop/install/msi/_index.md) is now generally available. +- Deploying Docker Desktop via the [MSI installer](/manuals/desktop/setup/install/msi/_index.md) is now generally available. - Two new methods to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) (windows registry key and `.plist` file) are now generally available. - Fresh installations of Docker Desktop now use the containerd image store by default. - [Compose Bridge](/manuals/compose/bridge/_index.md) (Experimental) is now available from the Compose file viewer. Easily convert and deploy your Compose project to a Kubernetes cluster. @@ -239,7 +239,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec - [Docker Debug](/reference/cli/docker/debug.md) is now generally available. - BuildKit now evaluates Dockerfile rules to inform you of potential issues. - **Resource Allocation** settings can now be accessed directly from the resource usage data displayed in the Dashboard footer. -- New and improved experience for [troubleshooting](/manuals/desktop/troubleshoot/_index.md). +- New and improved experience for [troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md). ### Upgrades @@ -275,7 +275,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec #### For Mac -- The Configuration integrity check feature now provides more context around what has changed with your Docker Desktop configuration. For more information, see the [FAQs](faqs/macfaqs.md). +- The Configuration integrity check feature now provides more context around what has changed with your Docker Desktop configuration. For more information, see the [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md). - The Configuration integrity check feature shows an error when it fails to repair Docker Desktop. - Fixed a bug where the IPv6 TCP was set to `host.docker.internal`. Fixes [docker/for-mac#7332](https://github.com/docker/for-mac/issues/7332). - Fixed an issue where the `docker-compose` symlink pointed to an empty location. Fixes [docker/for-mac#7345](https://github.com/docker/for-mac/issues/7345). @@ -347,7 +347,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL #### For Windows - Fixed an issue on the WSL 2 engine where Docker Desktop would not detect the existence of the `docker-desktop-data` distribution if it had been manually moved by the user. -- The Windows on ARM installer and the [privileged service](/manuals/desktop/install/windows-permission-requirements.md#privileged-helper) are now built for ARM64. +- The Windows on ARM installer and the [privileged service](/manuals/desktop/setup/install/windows-permission-requirements.md#privileged-helper) are now built for ARM64. #### For Mac @@ -485,7 +485,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL #### For Windows -- Added support for [Kerberos and NTLM proxy authentication](/manuals/desktop/settings.md#proxy-authentication) on Windows. Requires a Business subscription. +- Added support for [Kerberos and NTLM proxy authentication](/manuals/desktop/settings-and-maintenance/settings.md#proxy-authentication) on Windows. Requires a Business subscription. ### Upgrades @@ -965,7 +965,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st ### New -- Rosetta is now Generally Available for all users on macOS 13 or later. It provides faster emulation of Intel-based images on Apple Silicon. To use Rosetta, see [Settings](/manuals/desktop/settings.md). Rosetta is enabled by default on macOS 14.1 and later. +- Rosetta is now Generally Available for all users on macOS 13 or later. It provides faster emulation of Intel-based images on Apple Silicon. To use Rosetta, see [Settings](/manuals/desktop/settings-and-maintenance/settings.md). Rosetta is enabled by default on macOS 14.1 and later. - Docker Desktop now detects if a WSL version is out of date. If an out dated version of WSL is detected, you can allow Docker Desktop to automatically update the installation or you can manually update WSL outside of Docker Desktop. - New installations of Docker Desktop for Windows now require a Windows version of 19044 or later. - Administrators now have the ability to control Docker Scout image analysis in [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/configure.md). @@ -1026,7 +1026,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st #### For Windows -- **Switch to Windows containers** option in the tray menu may not show up on Windows. As a workaround, edit the [`settings.json` file](/manuals/desktop/settings.md) and set `"displaySwitchWinLinContainers": true`. +- **Switch to Windows containers** option in the tray menu may not show up on Windows. As a workaround, edit the [`settings.json` file](/manuals/desktop/settings-and-maintenance/settings.md) and set `"displaySwitchWinLinContainers": true`. #### For all platforms @@ -1250,13 +1250,13 @@ This can be resolved by adding the user to the **docker-users** group. Before st #### For Mac - Fixed a bug that prevented Docker Desktop from starting. [docker/for-mac#6890](https://github.com/docker/for-mac/issues/6890) -- Resource Saver is now available on Mac. It optimises Docker Desktop's usage of your system resources when no containers are running. To access this feature, make sure you have [turned on access to experimental features](/manuals/desktop/settings.md) in settings. +- Resource Saver is now available on Mac. It optimises Docker Desktop's usage of your system resources when no containers are running. To access this feature, make sure you have [turned on access to experimental features](/manuals/desktop/settings-and-maintenance/settings.md) in settings. #### For Windows - Fixed a bug where the self-diagnose tool showed a false-positive failure when vpnkit is expected to be not running. Fixes [docker/for-win#13479](https://github.com/docker/for-win/issues/13479). - Fixed a bug where an invalid regular expression in the search bar caused an error. Fixes [docker/for-win#13592](https://github.com/docker/for-win/issues/13592). -- Resource Saver is now available on Windows Hyper-V. It optimises Docker Desktop's usage of your system resources when no containers are running. To access this feature, make sure you have [turned on access to experimental features](/manuals/desktop/settings.md) in settings. +- Resource Saver is now available on Windows Hyper-V. It optimises Docker Desktop's usage of your system resources when no containers are running. To access this feature, make sure you have [turned on access to experimental features](/manuals/desktop/settings-and-maintenance/settings.md) in settings. ## 4.21.1 @@ -1368,7 +1368,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - Fixed a bug that meant WSL data could not be moved to a different disk. Fixes [docker/for-win#13269](https://github.com/docker/for-win/issues/13269). - Fixed a bug where Docker Desktop was not stopping its WSL distros (docker-desktop and docker-desktop-data) when it was shutdown, consuming host memory unnecessarily. -- Added a new setting that allows the Windows Docker daemon to use Docker Desktop's internal proxy when running Windows containers. See [Windows proxy settings](/manuals/desktop/settings.md#proxies). +- Added a new setting that allows the Windows Docker daemon to use Docker Desktop's internal proxy when running Windows containers. See [Windows proxy settings](/manuals/desktop/settings-and-maintenance/settings.md#proxies). #### For Linux @@ -1406,7 +1406,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - Improved `docker scout compare` command to compare two images, now also aliased under `docker scout diff`. - Added more details to dashboard errors when a `docker-compose` action fails ([docker/for-win#13378](https://github.com/docker/for-win/issues/13378)). -- Added support for setting HTTP proxy configuration during installation. This can be done via the `--proxy-http-mode`, `--overrider-proxy-http`, `--override-proxy-https` and `--override-proxy-exclude` installer flags in the case of installation from the CLI on [Mac](install/mac-install.md#install-from-the-command-line) and [Windows](install/windows-install.md#install-from-the-command-line), or alternatively by setting the values in the `install-settings.json` file. +- Added support for setting HTTP proxy configuration during installation. This can be done via the `--proxy-http-mode`, `--overrider-proxy-http`, `--override-proxy-https` and `--override-proxy-exclude` installer flags in the case of installation from the CLI on [Mac](/manuals/desktop/setup/install/mac-install.md#install-from-the-command-line) and [Windows](/manuals/desktop/setup/install/windows-install.md#install-from-the-command-line), or alternatively by setting the values in the `install-settings.json` file. - Docker Desktop now stops overriding .docker/config.json `credsStore` keys on application start. Note that if you use a custom credential helper then the CLI `docker login` and `docker logout` does not affect whether the UI is signed in to Docker or not. In general, it is better to sign into Docker via the UI since the UI supports multi-factor authentication. - Added a warning about the [forthcoming removal of Compose V1 from Docker Desktop](/manuals/compose/releases/migrate.md). Can be suppressed with `COMPOSE_V1_EOL_SILENT=1`. - In the Compose config, boolean fields in YAML should be either `true` or `false`. Deprecated YAML 1.1 values such as “on” or “no” now produce a warning. @@ -2020,7 +2020,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st ### New -- Docker Desktop is now fully supported for Docker Business customers inside VMware ESXi and Azure VMs. For more information, see [Run Docker Desktop inside a VM or VDI environment](/manuals/desktop/vm-vdi.md) +- Docker Desktop is now fully supported for Docker Business customers inside VMware ESXi and Azure VMs. For more information, see [Run Docker Desktop inside a VM or VDI environment](/manuals/desktop/setup/vm-vdi.md) - Added two new extensions ([vcluster](https://hub.docker.com/extensions/loftsh/vcluster-dd-extension) and [PGAdmin4](https://hub.docker.com/extensions/mochoa/pgadmin4-docker-extension)) to the Extensions Marketplace. - The ability to sort extensions has been added to the Extensions Marketplace. - Fixed a bug that caused some users to be asked for feedback too frequently. You'll now only be asked for feedback twice a year. @@ -2238,7 +2238,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st ### New -- Released [Docker Desktop for Linux](/manuals/desktop/install/linux/_index.md). +- Released [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md). - Beta release of [Docker Extensions](/manuals/extensions/_index.md) and Extensions SDK. - Created a Docker Homepage where you can run popular images and discover how to use them. - [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) @@ -2259,7 +2259,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st ### New -- Released [Docker Desktop for Linux](/manuals/desktop/install/linux/_index.md). +- Released [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md). - Beta release of [Docker Extensions](/manuals/extensions/_index.md) and Extensions SDK. - Created a Docker Homepage where you can run popular images and discover how to use them. - [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) @@ -2397,7 +2397,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st #### For Mac -- Docker Desktop 4.6.0 gives macOS users the option of enabling a new experimental file sharing technology called VirtioFS. During testing VirtioFS has been shown to drastically reduce the time taken to sync changes between the host and VM, leading to substantial performance improvements. For more information, see [VirtioFS](/manuals/desktop/settings.md#beta-features). +- Docker Desktop 4.6.0 gives macOS users the option of enabling a new experimental file sharing technology called VirtioFS. During testing VirtioFS has been shown to drastically reduce the time taken to sync changes between the host and VM, leading to substantial performance improvements. For more information, see [VirtioFS](/manuals/desktop/settings-and-maintenance/settings.md#beta-features). ### Updates @@ -2676,7 +2676,7 @@ CVE-2021-44228](https://www.docker.com/blog/apache-log4j-2-cve-2021-44228/). #### For Mac -- Docker Desktop on Apple silicon no longer requires Rosetta 2, with the exception of [three optional command line tools](troubleshoot/known-issues.md). +- Docker Desktop on Apple silicon no longer requires Rosetta 2, with the exception of [three optional command line tools](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). #### For Windows diff --git a/content/manuals/desktop/settings-and-maintenance/_index.md b/content/manuals/desktop/settings-and-maintenance/_index.md new file mode 100644 index 000000000000..22c1acffff4d --- /dev/null +++ b/content/manuals/desktop/settings-and-maintenance/_index.md @@ -0,0 +1,6 @@ +--- +build: + render: never +title: Settings and maintenance +weight: 40 +--- \ No newline at end of file diff --git a/content/manuals/desktop/backup-and-restore.md b/content/manuals/desktop/settings-and-maintenance/backup-and-restore.md similarity index 91% rename from content/manuals/desktop/backup-and-restore.md rename to content/manuals/desktop/settings-and-maintenance/backup-and-restore.md index dcd326ad8638..b985426334c2 100644 --- a/content/manuals/desktop/backup-and-restore.md +++ b/content/manuals/desktop/settings-and-maintenance/backup-and-restore.md @@ -2,7 +2,9 @@ title: How to back up and restore your Docker Desktop data keywords: Docker Desktop, backup, restore, migration, reinstall, containers, images, volumes -weight: 130 +weight: 20 +aliases: + - /desktop/backup-and-restore.md --- Use the following procedure to save and restore your images and container data. This is useful if you want to reset your VM disk or to move your Docker environment to a new @@ -27,16 +29,16 @@ computer, for example. If you used a [named volume](/manuals/engine/storage/_index.md#more-details-about-mount-types) to store container data, such as databases, refer to the [back up, restore, or migrate data volumes](/manuals/engine/storage/volumes.md#back-up-restore-or-migrate-data-volumes) page in the storage section. 2. Use [`docker push`](/reference/cli/docker/image/push.md) to push any - images you have built locally and want to keep to the [Docker Hub registry](../docker-hub/_index.md). + images you have built locally and want to keep to the [Docker Hub registry](/manuals/docker-hub/_index.md). - Make sure to configure the [repository's visibility as "private"](../docker-hub/repos/_index.md) + Make sure to configure the [repository's visibility as "private"](/manuals/docker-hub/repos/_index.md) for images that should not be publicly accessible. Alternatively, use [`docker image save -o images.tar image1 [image2 ...]`](/reference/cli/docker/image/save.md) to save any images you want to keep to a local tar file. After backing up your data, you can uninstall the current version of Docker Desktop -and [install a different version](release-notes.md) or reset Docker Desktop to factory defaults. +and [install a different version](/manuals/desktop/release-notes.md) or reset Docker Desktop to factory defaults. ## Restore your data diff --git a/content/manuals/desktop/settings.md b/content/manuals/desktop/settings-and-maintenance/settings.md similarity index 96% rename from content/manuals/desktop/settings.md rename to content/manuals/desktop/settings-and-maintenance/settings.md index b508546d0e2e..80c8f339ff59 100644 --- a/content/manuals/desktop/settings.md +++ b/content/manuals/desktop/settings-and-maintenance/settings.md @@ -8,12 +8,13 @@ aliases: - /desktop/settings/mac/ - /desktop/settings/windows/ - /desktop/settings/linux/ -weight: 160 + - /desktop/settings/ +weight: 10 --- 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 Desktop Dashboard. You can also locate the `settings-store.json` file (or `settings.json` for Docker Desktop versions 4.34 and earlier) at: @@ -57,7 +58,7 @@ If you choose the integrated terminal, you can run commands in a running contain 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.md). + For more information, see [containerd image store](/manuals/desktop/containerd.md). - {{< badge color=blue text="Mac only" >}} **Choose Virtual Machine Manager (VMM)**. Choose the Virtual Machine Manager for creating and managing the Docker Desktop Linux VM. - Select **Docker VMM** for the latest and most performant Hypervisor/Virtual Machine Manager. This option is available only on Apple Silicon Macs running macOS 12.5 or later and is currently in Beta. @@ -98,7 +99,7 @@ If you choose the integrated terminal, you can run commands in a running contain - The symlink of the default Docker socket. Additionally, Docker Desktop ensures that the context is switched to `desktop-linux` on startup. - You are notified if changes are found and are able to restore the configuration directly from the notification. For more information, see the [FAQs](/manuals/desktop/faqs/macfaqs.md#why-do-i-keep-getting-a-notification-telling-me-an-application-has-changed-my-desktop-configurations). + You are notified if changes are found and are able to restore the configuration directly from the notification. For more information, see the [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md#why-do-i-keep-getting-a-notification-telling-me-an-application-has-changed-my-desktop-configurations). ## Resources @@ -213,7 +214,7 @@ File share settings are: > once a file called `test` is created, attempts to create a second file called > `Test` will fail. > -> For more information, see [Volume mounting requires file sharing for any project directories outside of `/Users`](/manuals/desktop/troubleshoot/topics.md) +> For more information, see [Volume mounting requires file sharing for any project directories outside of `/Users`](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md) #### Shared folders on demand @@ -226,7 +227,7 @@ popup asking if you want to share the specified folder. You can select to **Share it**, in which case it is added to your Docker Desktop Shared Folders list and available to containers. Alternatively, you can opt not to share it by selecting **Cancel**. -![Shared folder on demand](images/shared-folder-on-demand.png) +![Shared folder on demand](../images/shared-folder-on-demand.png) ### Proxies @@ -493,7 +494,7 @@ Use the **Notifications** tab to turn on or turn off notifications for the follo By default, all notifications are turned on. You'll always receive error notifications and notifications about new Docker Desktop releases and updates. -Notifications momentarily appear in the lower-right of the Docker Desktop Dashboard and then move to the **Notifications** drawer. To open the **Notifications** drawer, select {{< inline-image src="images/notifications.svg" alt="notifications" >}}. +Notifications momentarily appear in the lower-right of the Docker Desktop Dashboard and then move to the **Notifications** drawer. To open the **Notifications** drawer, select {{< inline-image src="../images/notifications.svg" alt="notifications" >}}. ## Advanced @@ -509,8 +510,8 @@ On Mac, you can reconfigure your initial installation settings on the **Advance ``` 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](/manuals/desktop/install/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](/manuals/desktop/setup/install/mac-permission-requirements.md#installing-symlinks). -- **Enable privileged port mapping (Requires password)**. Starts the privileged helper process which binds the ports that are between 1 and 1024. For more information, see [permission requirements for macOS](/manuals/desktop/install/mac-permission-requirements.md#binding-privileged-ports). +- **Enable privileged port mapping (Requires password)**. Starts the privileged helper process which binds the ports that are between 1 and 1024. For more information, see [permission requirements for macOS](/manuals/desktop/setup/install/mac-permission-requirements.md#binding-privileged-ports). - For more information on each configuration and use case, see [Permission requirements](/manuals/desktop/install/mac-permission-requirements.md). + For more information on each configuration and use case, see [Permission requirements](/manuals/desktop/setup/install/mac-permission-requirements.md). diff --git a/content/manuals/desktop/install/_index.md b/content/manuals/desktop/setup/_index.md similarity index 66% rename from content/manuals/desktop/install/_index.md rename to content/manuals/desktop/setup/_index.md index 186d97b05dd3..676f6ca7c187 100644 --- a/content/manuals/desktop/install/_index.md +++ b/content/manuals/desktop/setup/_index.md @@ -1,6 +1,6 @@ --- build: render: never -title: Install +title: Setup weight: 10 ---- +--- \ No newline at end of file diff --git a/content/manuals/desktop/allow-list.md b/content/manuals/desktop/setup/allow-list.md similarity index 95% rename from content/manuals/desktop/allow-list.md rename to content/manuals/desktop/setup/allow-list.md index 8c859a8d04bc..78b7ea3e6a41 100644 --- a/content/manuals/desktop/allow-list.md +++ b/content/manuals/desktop/setup/allow-list.md @@ -2,7 +2,10 @@ description: Allowlist for Docker Desktop for Business customers keywords: Docker Desktop, allowlist, allow list, firewall title: Allowlist for Docker Desktop +linkTitle: Allowlist weight: 100 +aliases: + - /desktop/allow-list/ --- This page contains the domain URLs that you need to add to a firewall allowlist to ensure Docker Desktop works properly within your organization. diff --git a/content/manuals/desktop/setup/install/_index.md b/content/manuals/desktop/setup/install/_index.md new file mode 100644 index 000000000000..3b6650ef5cdf --- /dev/null +++ b/content/manuals/desktop/setup/install/_index.md @@ -0,0 +1,8 @@ +--- +build: + render: never +title: Install +weight: 10 +aliases: +- /desktop/install/ +--- diff --git a/content/manuals/desktop/install/images/docker-app-in-apps.png b/content/manuals/desktop/setup/install/images/docker-app-in-apps.png similarity index 100% rename from content/manuals/desktop/install/images/docker-app-in-apps.png rename to content/manuals/desktop/setup/install/images/docker-app-in-apps.png diff --git a/content/manuals/desktop/install/images/whale-x.svg b/content/manuals/desktop/setup/install/images/whale-x.svg similarity index 100% rename from content/manuals/desktop/install/images/whale-x.svg rename to content/manuals/desktop/setup/install/images/whale-x.svg diff --git a/content/manuals/desktop/install/linux/_index.md b/content/manuals/desktop/setup/install/linux/_index.md similarity index 93% rename from content/manuals/desktop/install/linux/_index.md rename to content/manuals/desktop/setup/install/linux/_index.md index b6c364d70aa1..185c6807a70a 100644 --- a/content/manuals/desktop/install/linux/_index.md +++ b/content/manuals/desktop/setup/install/linux/_index.md @@ -10,6 +10,7 @@ weight: 60 aliases: - /desktop/linux/install/ - /desktop/install/linux-install/ +- /desktop/install/linux/ --- > **Docker Desktop terms** @@ -39,7 +40,7 @@ Docker Desktop for Linux provides a user-friendly graphical interface that simpl Docker Desktop for Linux and Docker Engine can be installed side-by-side on the same machine. Docker Desktop for Linux stores containers and images in an isolated storage location within a VM and offers -controls to restrict [its resources](/manuals/desktop/settings.md#resources). Using a dedicated storage +controls to restrict [its resources](/manuals/desktop/settings-and-maintenance/settings.md#resources). Using a dedicated storage location for Docker Desktop prevents it from interfering with a Docker Engine installation on the same machine. @@ -139,10 +140,10 @@ To install Docker Desktop successfully, your Linux host must meet the following - Gnome, KDE, or MATE Desktop environment. - For many Linux distros, the Gnome environment does not support tray icons. To add support for tray icons, you need to install a Gnome extension. For example, [AppIndicator](https://extensions.gnome.org/extension/615/appindicator-support/). - At least 4 GB of RAM. -- Enable configuring ID mapping in user namespaces, see [File sharing](/manuals/desktop/faqs/linuxfaqs.md#how-do-i-enable-file-sharing). Note that for Docker Desktop version 4.35 and later, this is not required anymore. -- Recommended: [Initialize `pass`](/manuals/desktop/get-started.md#credentials-management-for-linux-users) for credentials management. +- Enable configuring ID mapping in user namespaces, see [File sharing](/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md#how-do-i-enable-file-sharing). Note that for Docker Desktop version 4.35 and later, this is not required anymore. +- Recommended: [Initialize `pass`](/manuals/desktop/setup/sign-in.md#credentials-management-for-linux-users) for credentials management. -Docker Desktop for Linux runs a Virtual Machine (VM). For more information on why, see [Why Docker Desktop for Linux runs a VM](/manuals/desktop/faqs/linuxfaqs.md#why-does-docker-desktop-for-linux-run-a-vm). +Docker Desktop for Linux runs a Virtual Machine (VM). For more information on why, see [Why Docker Desktop for Linux runs a VM](/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md#why-does-docker-desktop-for-linux-run-a-vm). > [!NOTE] > diff --git a/content/manuals/desktop/install/linux/archlinux.md b/content/manuals/desktop/setup/install/linux/archlinux.md similarity index 84% rename from content/manuals/desktop/install/linux/archlinux.md rename to content/manuals/desktop/setup/install/linux/archlinux.md index 214036ed504b..cdbad92225d5 100644 --- a/content/manuals/desktop/install/linux/archlinux.md +++ b/content/manuals/desktop/setup/install/linux/archlinux.md @@ -8,6 +8,7 @@ linkTitle: Arch aliases: - /desktop/linux/install/archlinux/ - /desktop/install/archlinux/ +- /desktop/install/linux/archlinux/ --- > **Docker Desktop terms** @@ -54,8 +55,8 @@ To install Docker Desktop successfully, you must meet the [general system requir - Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - Take a look at the [Docker workshop](/get-started/workshop/_index.md) to learn how to build an image and run it as a containerized application. - [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and all its features. -- [Troubleshooting](/manuals/desktop/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. -- [FAQs](/manuals/desktop/faqs/general.md) provide answers to frequently asked questions. +- [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. +- [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md) provide answers to frequently asked questions. - [Release notes](/manuals/desktop/release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -- [Back up and restore data](/manuals/desktop/backup-and-restore.md) provides instructions +- [Back up and restore data](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/content/manuals/desktop/install/linux/debian.md b/content/manuals/desktop/setup/install/linux/debian.md similarity index 89% rename from content/manuals/desktop/install/linux/debian.md rename to content/manuals/desktop/setup/install/linux/debian.md index be1642eb3026..52218bd047b9 100644 --- a/content/manuals/desktop/install/linux/debian.md +++ b/content/manuals/desktop/setup/install/linux/debian.md @@ -9,6 +9,7 @@ toc_max: 4 aliases: - /desktop/linux/install/debian/ - /desktop/install/debian/ +- /desktop/install/linux/debian/ --- > **Docker Desktop terms** @@ -89,8 +90,8 @@ Don't forget to substitute `` with the architecture you want. - Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - Take a look at the [Docker workshop](/get-started/workshop/_index.md) to learn how to build an image and run it as a containerized application. - [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and all its features. -- [Troubleshooting](/manuals/desktop/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. -- [FAQs](/manuals/desktop/faqs/general.md) provide answers to frequently asked questions. +- [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. +- [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md) provide answers to frequently asked questions. - [Release notes](/manuals/desktop/release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -- [Back up and restore data](/manuals/desktop/backup-and-restore.md) provides instructions +- [Back up and restore data](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/content/manuals/desktop/install/linux/fedora.md b/content/manuals/desktop/setup/install/linux/fedora.md similarity index 88% rename from content/manuals/desktop/install/linux/fedora.md rename to content/manuals/desktop/setup/install/linux/fedora.md index 9dc03aba71b4..8f41573a0ac4 100644 --- a/content/manuals/desktop/install/linux/fedora.md +++ b/content/manuals/desktop/setup/install/linux/fedora.md @@ -9,6 +9,7 @@ toc_max: 4 aliases: - /desktop/linux/install/fedora/ - /desktop/install/fedora/ +- /desktop/install/linux/fedora/ --- > **Docker Desktop terms** @@ -80,8 +81,8 @@ Don't forget to substitute `` with the architecture you want. - Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - Take a look at the [Docker workshop](/get-started/workshop/_index.md) to learn how to build an image and run it as a containerized application. - [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and all its features. -- [Troubleshooting](/manuals/desktop/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. -- [FAQs](/manuals/desktop/faqs/general.md) provide answers to frequently asked questions. +- [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. +- [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md) provide answers to frequently asked questions. - [Release notes](/manuals/desktop/release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -- [Back up and restore data](/manuals/desktop/backup-and-restore.md) provides instructions +- [Back up and restore data](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/content/manuals/desktop/install/linux/rhel.md b/content/manuals/desktop/setup/install/linux/rhel.md similarity index 92% rename from content/manuals/desktop/install/linux/rhel.md rename to content/manuals/desktop/setup/install/linux/rhel.md index 5fdba5ea02e4..aa6cd32d2203 100644 --- a/content/manuals/desktop/install/linux/rhel.md +++ b/content/manuals/desktop/setup/install/linux/rhel.md @@ -11,6 +11,8 @@ params: badge: color: green text: New +aliases: +- /desktop/install/linux/rhel/ --- > **Docker Desktop terms** @@ -141,8 +143,8 @@ $ sudo dnf install ./docker-desktop--rhel.rpm - Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - Take a look at the [Docker workshop](/get-started/workshop/_index.md) to learn how to build an image and run it as a containerized application. - [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and all its features. -- [Troubleshooting](/manuals/desktop/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. -- [FAQs](/manuals/desktop/faqs/general.md) provide answers to frequently asked questions. +- [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. +- [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md) provide answers to frequently asked questions. - [Release notes](/manuals/desktop/release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -- [Back up and restore data](/manuals/desktop/backup-and-restore.md) provides instructions +- [Back up and restore data](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/content/manuals/desktop/install/linux/ubuntu.md b/content/manuals/desktop/setup/install/linux/ubuntu.md similarity index 90% rename from content/manuals/desktop/install/linux/ubuntu.md rename to content/manuals/desktop/setup/install/linux/ubuntu.md index 1a6f3ed846c9..81a5a22cb9e7 100644 --- a/content/manuals/desktop/install/linux/ubuntu.md +++ b/content/manuals/desktop/setup/install/linux/ubuntu.md @@ -12,6 +12,7 @@ toc_max: 4 aliases: - /desktop/linux/install/ubuntu/ - /desktop/install/ubuntu/ +- /desktop/install/linux/ubuntu/ --- > **Docker Desktop terms** @@ -89,8 +90,8 @@ Don't forget to substitute `` with the architecture you want. - Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - Take a look at the [Docker workshop](/get-started/workshop/_index.md) to learn how to build an image and run it as a containerized application. - [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and all its features. -- [Troubleshooting](/manuals/desktop/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. -- [FAQs](/manuals/desktop/faqs/general.md) provide answers to frequently asked questions. +- [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. +- [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md) provide answers to frequently asked questions. - [Release notes](/manuals/desktop/release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -- [Back up and restore data](/manuals/desktop/backup-and-restore.md) provides instructions +- [Back up and restore data](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/content/manuals/desktop/install/mac-install.md b/content/manuals/desktop/setup/install/mac-install.md similarity index 82% rename from content/manuals/desktop/install/mac-install.md rename to content/manuals/desktop/setup/install/mac-install.md index 224699718577..5d4b71616d3f 100644 --- a/content/manuals/desktop/install/mac-install.md +++ b/content/manuals/desktop/setup/install/mac-install.md @@ -15,6 +15,7 @@ aliases: - /docker-for-mac/apple-m1/ - /docker-for-mac/apple-silicon/ - /desktop/mac/apple-silicon/ +- /desktop/install/mac-install/ --- > **Docker Desktop terms** @@ -28,7 +29,7 @@ This page contains download URLs, information about system requirements, and ins {{< button text="Docker Desktop for Mac with Apple silicon" url="https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64" >}} {{< button text="Docker Desktop for Mac with Intel chip" url="https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64" >}} -*For checksums, see [Release notes](../release-notes.md).* +*For checksums, see [Release notes](/manuals/desktop/release-notes.md).* ## System requirements @@ -53,7 +54,7 @@ This page contains download URLs, information about system requirements, and ins > Docker supports Docker Desktop on the most recent versions of macOS. That is, the current release of macOS and the previous two releases. As new major versions of macOS are made generally available, Docker stops supporting the oldest version and supports the newest version of macOS (in addition to the previous two releases). - At least 4 GB of RAM. -- For the best experience, it's recommended that you install Rosetta 2. There is no longer a hard requirement to install Rosetta 2, however there are a few optional command line tools that still require Rosetta 2 when using Darwin/AMD64. See [Known issues](../troubleshoot/known-issues.md). To install Rosetta 2 manually from the command line, run the following command: +- For the best experience, it's recommended that you install Rosetta 2. There is no longer a hard requirement to install Rosetta 2, however there are a few optional command line tools that still require Rosetta 2 when using Darwin/AMD64. See [Known issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). To install Rosetta 2 manually from the command line, run the following command: ```console $ softwareupdate --install-rosetta @@ -65,11 +66,11 @@ This page contains download URLs, information about system requirements, and ins > [!TIP] > -> See the [FAQs](/manuals/desktop/faqs/general.md#how-do-I-run-docker-desktop-without-administrator-privileges) on how to install and run Docker Desktop without needing administrator privileges. +> See the [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md#how-do-I-run-docker-desktop-without-administrator-privileges) on how to install and run Docker Desktop without needing administrator privileges. ### Install interactively -1. Download the installer using the download buttons at the top of the page, or from the [release notes](../release-notes.md). +1. Download the installer using the download buttons at the top of the page, or from the [release notes](/manuals/desktop/release-notes.md). 2. Double-click `Docker.dmg` to open the installer, then drag the Docker icon to the **Applications** folder. By default, Docker Desktop is installed at `/Applications/Docker.app`. @@ -91,12 +92,12 @@ This page contains download URLs, information about system requirements, and ins 6. From the installation window, select either: - **Use recommended settings (Requires password)**. This lets Docker Desktop automatically set the necessary configuration settings. - - **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. See [Settings](/manuals/desktop/settings.md#advanced), for more information and how to set the location of the Docker CLI tools. + - **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. See [Settings](/manuals/desktop/settings-and-maintenance/settings.md#advanced), for more information and how to set the location of the Docker CLI tools. 7. Select **Finish**. If you have applied any of the previous configurations that require a password in step 6, enter your password to confirm your choice. ### Install from the command line -After downloading `Docker.dmg` from either the download buttons at the top of the page or from the [release notes](../release-notes.md), run the following commands in a terminal to install Docker Desktop in the **Applications** folder: +After downloading `Docker.dmg` from either the download buttons at the top of the page or from the [release notes](/manuals/desktop/release-notes.md), run the following commands in a terminal to install Docker Desktop in the **Applications** folder: ```console $ sudo hdiutil attach Docker.dmg @@ -109,7 +110,7 @@ By default, Docker Desktop is installed at `/Applications/Docker.app`. As macOS The `install` command accepts the following flags: - `--accept-license`: Accepts the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement) now, rather than requiring it to be accepted when the application is first run. - `--allowed-org=`: Requires the user to sign in and be part of the specified Docker Hub organization when running the application -- `--user=`: Performs the privileged configurations once during installation. This removes the need for the user to grant root privileges on first run. For more information, see [Privileged helper permission requirements](/manuals/desktop/install/mac-permission-requirements.md#permission-requirements). To find the username, enter `ls /Users` in the CLI. +- `--user=`: Performs the privileged configurations once during installation. This removes the need for the user to grant root privileges on first run. For more information, see [Privileged helper permission requirements](/manuals/desktop/setup/install/mac-permission-requirements.md#permission-requirements). To find the username, enter `ls /Users` in the CLI. - `--admin-settings`: Automatically creates an `admin-settings.json` file which is used by administrators to control certain Docker Desktop settings on client machines within their organization. For more information, see [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md). - It must be used together with the `--allowed-org=` flag. - For example: `--allowed-org= --admin-settings="{'configurationFileVersion': 2, 'enhancedContainerIsolation': {'value': true, 'locked': false}}"` @@ -131,10 +132,10 @@ The `install` command accepts the following flags: - Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - [Get started with Docker](/get-started/introduction/_index.md). -- [Explore Docker Desktop](../use-desktop/_index.md) and all its features. -- [Troubleshooting](/manuals/desktop/troubleshoot/_index.md) describes common problems, workarounds, how +- [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and all its features. +- [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. -- [FAQs](../faqs/general.md) provide answers to frequently asked questions. -- [Release notes](../release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -- [Back up and restore data](../backup-and-restore.md) provides instructions +- [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md) provide answers to frequently asked questions. +- [Release notes](/manuals/desktop/release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. +- [Back up and restore data](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/content/manuals/desktop/install/mac-permission-requirements.md b/content/manuals/desktop/setup/install/mac-permission-requirements.md similarity index 97% rename from content/manuals/desktop/install/mac-permission-requirements.md rename to content/manuals/desktop/setup/install/mac-permission-requirements.md index 9f039a0ebcb6..9f24fe9d1ca7 100644 --- a/content/manuals/desktop/install/mac-permission-requirements.md +++ b/content/manuals/desktop/setup/install/mac-permission-requirements.md @@ -7,6 +7,7 @@ aliases: - /docker-for-mac/privileged-helper/ - /desktop/mac/privileged-helper/ - /desktop/mac/permission-requirements/ +- /desktop/install/mac-permission-requirements/ weight: 20 --- @@ -64,7 +65,7 @@ The Docker binaries are installed by default in `/Applications/Docker.app/Conten With version 4.18 and later, you can choose whether to install symlinks either in `/usr/local/bin` or `$HOME/.docker/bin` during installation of Docker Desktop. -If `/usr/local/bin` is chosen, and this location is not writable by unprivileged users, Docker Desktop requires authorization to confirm this choice before the symlinks to Docker binaries are created in `/usr/local/bin`. If `$HOME/.docker/bin` is chosen, authorization is not required, but then you must [manually add `$HOME/.docker/bin`](/manuals/desktop/settings.md#advanced) to their PATH. +If `/usr/local/bin` is chosen, and this location is not writable by unprivileged users, Docker Desktop requires authorization to confirm this choice before the symlinks to Docker binaries are created in `/usr/local/bin`. If `$HOME/.docker/bin` is chosen, authorization is not required, but then you must [manually add `$HOME/.docker/bin`](/manuals/desktop/settings-and-maintenance/settings.md#advanced) to their PATH. You are also given the option to enable the installation of the `/var/run/docker.sock` symlink. Creating this symlink ensures various Docker clients relying on the default Docker socket path work without additional changes. @@ -134,7 +135,7 @@ On first run, Docker Desktop checks if `localhost` is resolved to `127.0.0.1`. I ## Installing from the command line -In version 4.11 and later of Docker Desktop for Mac, privileged configurations are applied during the installation with the `--user` flag on the [install command](/manuals/desktop/install/mac-install.md#install-from-the-command-line). In this case, you are not prompted to grant root privileges on the first run of Docker Desktop. Specifically, the `--user` flag: +In version 4.11 and later of Docker Desktop for Mac, privileged configurations are applied during the installation with the `--user` flag on the [install command](/manuals/desktop/setup/install/mac-install.md#install-from-the-command-line). In this case, you are not prompted to grant root privileges on the first run of Docker Desktop. Specifically, the `--user` flag: - Uninstalls the previous `com.docker.vmnetd` if present - Sets up symlinks - Ensures that `localhost` is resolved to `127.0.0.1` diff --git a/content/manuals/desktop/install/msi/_index.md b/content/manuals/desktop/setup/install/msi/_index.md similarity index 97% rename from content/manuals/desktop/install/msi/_index.md rename to content/manuals/desktop/setup/install/msi/_index.md index 9cdb5cbc360c..7214ed45966c 100644 --- a/content/manuals/desktop/install/msi/_index.md +++ b/content/manuals/desktop/setup/install/msi/_index.md @@ -4,6 +4,8 @@ linkTitle: Use the MSI installer weight: 50 description: If you're an IT admin, learn how to deploy Docker Desktop with Microsoft installer keywords: msi, docker desktop, windows, installation +aliases: +- /desktop/install/msi/ --- > [!NOTE] diff --git a/content/manuals/desktop/install/msi/faq.md b/content/manuals/desktop/setup/install/msi/faq.md similarity index 89% rename from content/manuals/desktop/install/msi/faq.md rename to content/manuals/desktop/setup/install/msi/faq.md index 94565b4c8e6f..f537e1eeeb84 100644 --- a/content/manuals/desktop/install/msi/faq.md +++ b/content/manuals/desktop/setup/install/msi/faq.md @@ -3,11 +3,13 @@ title: MSI FAQs description: Frequently asked questions for deploying Docker Desktop with Microsoft installer keywords: msi, deploy, docker desktop, faqs tags: [FAQ] +aliases: +- /desktop/install/msi/faq/ --- ### What happens to user data if they have an older Docker Desktop installation (i.e. `.exe`)? -If they have an older `.exe` installation, users must [uninstall](../../uninstall.md) this version before using the new MSI version. This deletes all Docker containers, images, volumes, and other Docker-related data local to the machine, and removes the files generated by the application. For older versions, users should [backup](../../backup-and-restore.md) any containers that they want to keep. +If they have an older `.exe` installation, users must [uninstall](/manuals/desktop/uninstall.md) this version before using the new MSI version. This deletes all Docker containers, images, volumes, and other Docker-related data local to the machine, and removes the files generated by the application. For older versions, users should [backup](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) any containers that they want to keep. For Docker Desktop versions 4.30 and later of the `exe` installer, a `-keep-data` flag is available. It removes Docker Desktop but keeps underlying data, such as the VMs that run containers. diff --git a/content/manuals/desktop/install/msi/install-and-configure.md b/content/manuals/desktop/setup/install/msi/install-and-configure.md similarity index 99% rename from content/manuals/desktop/install/msi/install-and-configure.md rename to content/manuals/desktop/setup/install/msi/install-and-configure.md index f96de559fd13..fe07e03f83d8 100644 --- a/content/manuals/desktop/install/msi/install-and-configure.md +++ b/content/manuals/desktop/setup/install/msi/install-and-configure.md @@ -2,6 +2,8 @@ title: Install and configure description: Understand how to use the MSI installer. Also explore additional configuration options. keywords: msi, windows, docker desktop, install, deploy, configure +aliases: +- /desktop/install/msi/install-and-configure/ --- ## Install interactively diff --git a/content/manuals/desktop/install/msi/use-intune.md b/content/manuals/desktop/setup/install/msi/use-intune.md similarity index 95% rename from content/manuals/desktop/install/msi/use-intune.md rename to content/manuals/desktop/setup/install/msi/use-intune.md index 1e9fdda03b72..38c6a31d158b 100644 --- a/content/manuals/desktop/install/msi/use-intune.md +++ b/content/manuals/desktop/setup/install/msi/use-intune.md @@ -1,7 +1,9 @@ --- title: Use Intune description: Use Intune, Microsoft's cloud-based device management tool, to deploy Docker Desktop -keywords: microsoft, windows, docker desktop, deploy, mdm, enterprise, administrator, +keywords: microsoft, windows, docker desktop, deploy, mdm, enterprise, administrator +aliases: +- /desktop/install/msi/use-intune/ --- Learn how to deploy Docker Desktop using Intune, Microsoft's cloud-based device management tool. diff --git a/content/manuals/desktop/install/windows-install.md b/content/manuals/desktop/setup/install/windows-install.md similarity index 89% rename from content/manuals/desktop/install/windows-install.md rename to content/manuals/desktop/setup/install/windows-install.md index d7e733e13479..6c7d5f86e1b6 100644 --- a/content/manuals/desktop/install/windows-install.md +++ b/content/manuals/desktop/setup/install/windows-install.md @@ -19,6 +19,7 @@ aliases: - /install/windows/ee-preview/ - /installation/windows/ - /desktop/win/configuring-wsl/ +- /desktop/install/windows-install/ --- > **Docker Desktop terms** @@ -32,7 +33,7 @@ This page contains the download URL, information about system requirements, and {{< button text="Docker Desktop for Windows - x86_64" url="https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64" >}} {{< button text="Docker Desktop for Windows - Arm (Beta)" url="https://desktop.docker.com/win/main/arm64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-arm64" >}} -_For checksums, see [Release notes](../release-notes.md)_ +_For checksums, see [Release notes](/manuals/desktop/release-notes.md)_ ## System requirements @@ -55,9 +56,9 @@ _For checksums, see [Release notes](../release-notes.md)_ - 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation) - 4GB system RAM - Enable hardware virtualization in BIOS. For more information, see - [Virtualization](../troubleshoot/topics.md#virtualization). + [Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization). -For more information on setting up WSL 2 with Docker Desktop, see [WSL](../wsl/_index.md). +For more information on setting up WSL 2 with Docker Desktop, see [WSL](/manuals/desktop/wsl/_index.md). > [!NOTE] > @@ -81,7 +82,7 @@ For more information on setting up WSL 2 with Docker Desktop, see [WSL](../wsl/_ - 4GB system RAM - Turn on BIOS-level hardware virtualization support in the BIOS settings. For more information, see - [Virtualization](../troubleshoot/topics.md#virtualization). + [Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization). > [!NOTE] > @@ -105,7 +106,7 @@ For more information on setting up WSL 2 with Docker Desktop, see [WSL](../wsl/_ - 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation) - 4GB system RAM - Enable hardware virtualization in BIOS. For more information, see - [Virtualization](../troubleshoot/topics.md#virtualization). + [Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization). > [!IMPORTANT] > @@ -120,7 +121,7 @@ accounts use the same VM to build and run containers. Note that it is not possib Running Docker Desktop inside a VMware ESXi or Azure VM is supported for Docker Business customers. It requires enabling nested virtualization on the hypervisor first. -For more information, see [Running Docker Desktop in a VM or VDI environment](../vm-vdi.md). +For more information, see [Running Docker Desktop in a VM or VDI environment](/manuals/desktop/setup/vm-vdi.md). {{< accordion title="How do I switch between Windows and Linux containers?" >}} @@ -142,7 +143,7 @@ For more information on Windows containers, refer to the following documentation [forked here to use containers](https://github.com/friism/MusicStore), is a good example of a multi-container application. - To understand how to connect to Windows containers from the local host, see - [I want to connect to a container from Windows](../networking.md#i-want-to-connect-to-a-container-from-the-host) + [I want to connect to a container from Windows](/manuals/desktop/networking.md#i-want-to-connect-to-a-container-from-the-host) > [!NOTE] > @@ -160,11 +161,11 @@ again when you switch back. > [!TIP] > -> See the [FAQs](/manuals/desktop/faqs/general.md#how-do-I-run-docker-desktop-without-administrator-privileges) on how to install and run Docker Desktop without needing administrator privileges. +> See the [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md#how-do-I-run-docker-desktop-without-administrator-privileges) on how to install and run Docker Desktop without needing administrator privileges. ### Install interactively -1. Download the installer using the download button at the top of the page, or from the [release notes](../release-notes.md). +1. Download the installer using the download button at the top of the page, or from the [release notes](/manuals/desktop/release-notes.md). 2. Double-click `Docker Desktop Installer.exe` to run the installer. By default, Docker Desktop is installed at `C:\Program Files\Docker\Docker`. @@ -259,7 +260,7 @@ Docker Desktop does not start automatically after installation. To start Docker > [!TIP] > -> As an IT administrator, you can use endpoint management (MDM) software to identify the number of Docker Desktop instances and their versions within your environment. This can provide accurate license reporting, help ensure your machines use the latest version of Docker Desktop, and enable you to [enforce sign-in](../../security/for-admins/enforce-sign-in/_index.md). +> As an IT administrator, you can use endpoint management (MDM) software to identify the number of Docker Desktop instances and their versions within your environment. This can provide accurate license reporting, help ensure your machines use the latest version of Docker Desktop, and enable you to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md). > - [Intune](https://learn.microsoft.com/en-us/mem/intune/apps/app-discovered-apps) > - [Jamf](https://docs.jamf.com/10.25.0/jamf-pro/administrator-guide/Application_Usage.html) > - [Kandji](https://support.kandji.io/support/solutions/articles/72000559793-view-a-device-application-list) @@ -270,9 +271,9 @@ Docker Desktop does not start automatically after installation. To start Docker - Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - [Get started with Docker](/get-started/introduction/_index.md). -- [Explore Docker Desktop](../use-desktop/_index.md) and all its features. -- [Troubleshooting](/manuals/desktop/troubleshoot/_index.md) describes common problems, workarounds, and +- [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and all its features. +- [Troubleshooting](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md) describes common problems, workarounds, and how to get support. -- [FAQs](../faqs/general.md) provide answers to frequently asked questions. -- [Release notes](../release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -- [Back up and restore data](../backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. +- [FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md) provide answers to frequently asked questions. +- [Release notes](/manuals/desktop/release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. +- [Back up and restore data](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/content/manuals/desktop/install/windows-permission-requirements.md b/content/manuals/desktop/setup/install/windows-permission-requirements.md similarity index 99% rename from content/manuals/desktop/install/windows-permission-requirements.md rename to content/manuals/desktop/setup/install/windows-permission-requirements.md index d3c27d4c8b5b..aded11b07d40 100644 --- a/content/manuals/desktop/install/windows-permission-requirements.md +++ b/content/manuals/desktop/setup/install/windows-permission-requirements.md @@ -5,6 +5,7 @@ title: Understand permission requirements for Windows aliases: - /desktop/windows/privileged-helper/ - /desktop/windows/permission-requirements/ +- /desktop/install/windows-permission-requirements/ weight: 40 --- diff --git a/content/manuals/desktop/get-started.md b/content/manuals/desktop/setup/sign-in.md similarity index 90% rename from content/manuals/desktop/get-started.md rename to content/manuals/desktop/setup/sign-in.md index 77012a569bab..0fcac9e92a58 100644 --- a/content/manuals/desktop/get-started.md +++ b/content/manuals/desktop/setup/sign-in.md @@ -5,7 +5,7 @@ keywords: Docker Dashboard, manage, containers, gui, dashboard, images, user man learning center, guide, sign in title: Sign in to Docker Desktop linkTitle: Sign in -weight: 20 +weight: 40 aliases: - /desktop/linux/ - /desktop/linux/index/ @@ -27,11 +27,12 @@ aliases: - /windows/ - /winkit/ - /winkit/getting-started/ +- /desktop/get-started/ --- Docker recommends that you authenticate using the **Sign in** option in the top-right corner of the Docker Dashboard. -In large enterprises where admin access is restricted, administrators can [enforce sign-in](../security/for-admins/enforce-sign-in/_index.md). +In large enterprises where admin access is restricted, administrators can [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md). > [!TIP] > @@ -41,7 +42,7 @@ In large enterprises where admin access is restricted, administrators can [enfor - You can access your Docker Hub repositories directly from Docker Desktop. -- Authenticated users also get a higher pull rate limit compared to anonymous users. For example, if you are authenticated, you get 200 pulls per 6 hour period, compared to 100 pulls per 6 hour period per IP address for anonymous users. For more information, see [Download rate limit](../docker-hub/download-rate-limit.md). +- Authenticated users also get a higher pull rate limit compared to anonymous users. For example, if you are authenticated, you get 200 pulls per 6 hour period, compared to 100 pulls per 6 hour period per IP address for anonymous users. For more information, see [Download rate limit](/manuals/docker-hub/download-rate-limit.md). - Improve your organization’s security posture for containerized development by taking advantage of [Hardened Desktop](/manuals/security/for-admins/hardened-desktop/_index.md). @@ -107,6 +108,6 @@ docker.io/molly/privateimage:latest ## What's next? -- [Explore Docker Desktop](use-desktop/_index.md) and its features. +- [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and its features. - Change your Docker Desktop settings -- [Browse common FAQs](faqs/general.md) +- [Browse common FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md) diff --git a/content/manuals/desktop/vm-vdi.md b/content/manuals/desktop/setup/vm-vdi.md similarity index 95% rename from content/manuals/desktop/vm-vdi.md rename to content/manuals/desktop/setup/vm-vdi.md index bf18e97c0c00..4e315c0bac0b 100644 --- a/content/manuals/desktop/vm-vdi.md +++ b/content/manuals/desktop/setup/vm-vdi.md @@ -3,8 +3,9 @@ description: Instructions on how to enable nested virtualization keywords: nested virtualization, Docker Desktop, windows, VM, VDI environment title: Run Docker Desktop for Windows in a VM or VDI environment aliases: -- /desktop/nested-virtualization/ -weight: 140 + - /desktop/nested-virtualization/ + - /desktop/vm-vdi/ +weight: 30 --- In general, we recommend running Docker Desktop natively on either Mac, Linux, or Windows. However, Docker Desktop for Windows can run inside a virtual desktop provided the virtual desktop is properly configured. @@ -17,7 +18,7 @@ To run Docker Desktop in a virtual desktop environment, it is essential nested v > > Support for running Docker Desktop on a virtual desktop is available to Docker Business customers, on VMware ESXi or Azure VMs only. -The support available from Docker extends to installing and running Docker Desktop inside the VM, once the nested virtualization is set up correctly. The only hypervisors we have successfully tested are VMware ESXi and Azure, and there is no support for other VMs. For more information on Docker Desktop support, see [Get support](support.md). +The support available from Docker extends to installing and running Docker Desktop inside the VM, once the nested virtualization is set up correctly. The only hypervisors we have successfully tested are VMware ESXi and Azure, and there is no support for other VMs. For more information on Docker Desktop support, see [Get support](/manuals/desktop/troubleshoot-and-support/support.md). For troubleshooting problems and intermittent failures that are outside of Docker's control, you should contact your hypervisor vendor. Each hypervisor vendor offers different levels of support. For example, Microsoft supports running nested Hyper-V both on-prem and on Azure, with some version constraints. This may not be the case for VMWare ESXi. diff --git a/content/manuals/desktop/troubleshoot-and-support/_index.md b/content/manuals/desktop/troubleshoot-and-support/_index.md new file mode 100644 index 000000000000..7cb0a4cd1ca7 --- /dev/null +++ b/content/manuals/desktop/troubleshoot-and-support/_index.md @@ -0,0 +1,6 @@ +--- +build: + render: never +title: Troubleshoot and support +weight: 50 +--- \ No newline at end of file diff --git a/content/manuals/desktop/faqs/_index.md b/content/manuals/desktop/troubleshoot-and-support/faqs/_index.md similarity index 53% rename from content/manuals/desktop/faqs/_index.md rename to content/manuals/desktop/troubleshoot-and-support/faqs/_index.md index 6f93f42c9dc5..026ecb568559 100644 --- a/content/manuals/desktop/faqs/_index.md +++ b/content/manuals/desktop/troubleshoot-and-support/faqs/_index.md @@ -2,5 +2,7 @@ build: render: never title: FAQs -weight: 190 +weight: 30 +aliases: + - /desktop/faqs/ --- diff --git a/content/manuals/desktop/faqs/general.md b/content/manuals/desktop/troubleshoot-and-support/faqs/general.md similarity index 83% rename from content/manuals/desktop/faqs/general.md rename to content/manuals/desktop/troubleshoot-and-support/faqs/general.md index 6fbdaa921f4f..6016e3fa1054 100644 --- a/content/manuals/desktop/faqs/general.md +++ b/content/manuals/desktop/troubleshoot-and-support/faqs/general.md @@ -19,17 +19,17 @@ cannot access features that require an active internet connection. Additionally, any functionality that requires you to sign in won't work while using Docker Desktop offline or in air-gapped environments. This includes: -- The resources in the [Learning Center](../use-desktop/_index.md) +- The resources in the [Learning Center](/manuals/desktop/use-desktop/_index.md) - Pulling or pushing an image to Docker Hub -- [Image Access Management](../../security/for-developers/access-tokens.md) -- [Static vulnerability scanning](../../docker-hub/vulnerability-scanning.md) +- [Image Access Management](/manuals/security/for-developers/access-tokens.md) +- [Static vulnerability scanning](/manuals/docker-hub/vulnerability-scanning.md) - Viewing remote images in the Docker Dashboard -- Setting up [Dev Environments](../dev-environments/_index.md) +- Setting up [Dev Environments](/manuals/desktop/dev-environments/_index.md) - Docker Build when using [BuildKit](/manuals/build/buildkit/_index.md#getting-started). You can work around this by disabling BuildKit. Run `DOCKER_BUILDKIT=0 docker build .` to disable BuildKit. -- [Kubernetes](../kubernetes.md) (Images are download when you enable Kubernetes for the first time) +- [Kubernetes](/manuals/desktop/kubernetes.md) (Images are download when you enable Kubernetes for the first time) - Checking for updates -- [In-app diagnostics](/manuals/desktop/troubleshoot/_index.md#diagnose-from-the-app) (including the [Self-diagnose tool](/manuals/desktop/troubleshoot/_index.md#diagnose-from-the-app)) +- [In-app diagnostics](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md#diagnose-from-the-app) (including the [Self-diagnose tool](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md#diagnose-from-the-app)) - Sending usage statistics ### How do I connect to the remote Docker Engine API? @@ -59,7 +59,7 @@ The host has a changing IP address, or none if you have no network access. We recommend that you connect to the special DNS name `host.docker.internal`, which resolves to the internal IP address used by the host. -For more information and examples, see [how to connect from a container to a service on the host](../networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). +For more information and examples, see [how to connect from a container to a service on the host](/manuals/desktop/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). ### Can I pass through a USB device to a container? diff --git a/content/manuals/desktop/faqs/linuxfaqs.md b/content/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md similarity index 100% rename from content/manuals/desktop/faqs/linuxfaqs.md rename to content/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md diff --git a/content/manuals/desktop/faqs/macfaqs.md b/content/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md similarity index 100% rename from content/manuals/desktop/faqs/macfaqs.md rename to content/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md diff --git a/content/manuals/desktop/faqs/releases.md b/content/manuals/desktop/troubleshoot-and-support/faqs/releases.md similarity index 100% rename from content/manuals/desktop/faqs/releases.md rename to content/manuals/desktop/troubleshoot-and-support/faqs/releases.md diff --git a/content/manuals/desktop/faqs/windowsfaqs.md b/content/manuals/desktop/troubleshoot-and-support/faqs/windowsfaqs.md similarity index 92% rename from content/manuals/desktop/faqs/windowsfaqs.md rename to content/manuals/desktop/troubleshoot-and-support/faqs/windowsfaqs.md index 010fd2b27cfa..949fc9574358 100644 --- a/content/manuals/desktop/faqs/windowsfaqs.md +++ b/content/manuals/desktop/troubleshoot-and-support/faqs/windowsfaqs.md @@ -22,14 +22,14 @@ No, running Docker Desktop on Windows Server is not supported. ### Can I change permissions on shared volumes for container-specific deployment requirements? Docker Desktop does not enable you to control (`chmod`) -the Unix-style permissions on [shared volumes](/manuals/desktop/settings.md#file-sharing) for +the Unix-style permissions on [shared volumes](/manuals/desktop/settings-and-maintenance/settings.md#file-sharing) for deployed containers, but rather sets permissions to a default value of [0777](https://chmodcommand.com/chmod-0777/) (`read`, `write`, `execute` permissions for `user` and for `group`) which is not configurable. For workarounds and to learn more, see -[Permissions errors on data directories for shared volumes](../troubleshoot/topics.md#permissions-errors-on-data-directories-for-shared-volumes). +[Permissions errors on data directories for shared volumes](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#permissions-errors-on-data-directories-for-shared-volumes). ### How do symlinks work on Windows? @@ -71,7 +71,7 @@ You need to restart Docker Desktop after making any changes to the keychain or to the `~/.docker/certs.d` directory in order for the changes to take effect. The registry cannot be listed as an insecure registry (see -[Docker Daemon](/manuals/desktop/settings.md#docker-engine)). Docker Desktop ignores +[Docker Daemon](/manuals/desktop/settings-and-maintenance/settings.md#docker-engine)). Docker Desktop ignores certificates listed under insecure registries, and does not send client certificates. Commands like `docker run` that attempt to pull from the registry produce error messages on the command line, as well as on the registry. diff --git a/content/manuals/desktop/feedback.md b/content/manuals/desktop/troubleshoot-and-support/feedback.md similarity index 99% rename from content/manuals/desktop/feedback.md rename to content/manuals/desktop/troubleshoot-and-support/feedback.md index c0154b54377c..513ef1e307e4 100644 --- a/content/manuals/desktop/feedback.md +++ b/content/manuals/desktop/troubleshoot-and-support/feedback.md @@ -3,7 +3,7 @@ description: Find a way to provide feedback that's right for you keywords: Feedback, Docker Desktop, Linux, Mac, Windows, Dev Environments, Extensions, Community forum, bugs, problems, issues title: Give feedback -weight: 180 +weight: 40 --- There are many ways you can provide feedback on Docker Desktop or Docker Desktop features. diff --git a/content/manuals/desktop/support.md b/content/manuals/desktop/troubleshoot-and-support/support.md similarity index 57% rename from content/manuals/desktop/support.md rename to content/manuals/desktop/troubleshoot-and-support/support.md index da98960154cc..c603591a5ca7 100644 --- a/content/manuals/desktop/support.md +++ b/content/manuals/desktop/troubleshoot-and-support/support.md @@ -2,7 +2,9 @@ description: See what support is available for Docker Desktop keywords: Support, Docker Desktop, Linux, Mac, Windows title: Get support -weight: 170 +weight: 20 +aliases: + - /desktop/support/ --- Find information on how to get support, and the scope of Docker Desktop support. @@ -16,27 +18,36 @@ Find information on how to get support, and the scope of Docker Desktop support. ### How do I get Docker Desktop support? -If you have a paid Docker subscription, raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/). +If you have a paid Docker subscription, you can [contact the Support team](https://hub.docker.com/support/contact/). -Docker Community users can get support through our Github repos for-win, for-mac, for-linux, where we respond on a best-effort basis. +All Docker users can seek support through the following resources, where Docker or the community respond on a best effort basis. + - [Docker Desktop for Windows GitHub repo](https://github.com/docker/for-win) + - [Docker Desktop for Mac GitHub repo](https://github.com/docker/for-mac) + - [Docker Desktop for Linux GitHub repo](https://github.com/docker/desktop-linux) + - [Docker Community Forums](https://forums.docker.com/) + - [Docker Community Slack](http://dockr.ly/comm-slack) ### What support can I get? -If you have a paid Docker subscription, you can request for support on the following types of issues: - -* Desktop upgrade issues -* Desktop installation issues - * Installation crashes - * Failure to launch Docker Desktop on first run -* Usage issues - * Crash closing software - * Docker Desktop not behaving as expected -* Configuration issues -* Basic product ‘how to’ questions - -For Windows users, you can also request support on: -* Enabling virtualization in BIOS -* Enabling Windows features +* Account management related issues + * Automated builds + * Basic product 'how to' questions + * Billing or subscription issues + * Configuration issues + * Desktop installation issues + * Installation crashes + * Failure to launch Docker Desktop on first run + * Desktop update issues + * Sign-in issues in both the command line interface and Docker Hub user interface + * Push or pull issues, including rate limiting + * Usage issues + * Crash closing software + * Docker Desktop not behaving as expected + + For Windows users, you can also request support on: + * Turning on virtualization in BIOS + * Turning on Windows features + * Running inside [certain VM or VDI environments](/manuals/desktop/setup/vm-vdi.md) (Docker Business customers only) ### What is not supported? @@ -57,15 +68,18 @@ Docker Desktop excludes support for the following types of issues: * Defects in the Docker software due to hardware malfunction, abuse, or improper use * Any version of the Docker software other than the latest version * Reimbursing and expenses spent for third-party services not provided by Docker -* Docker Support excludes training, customization, and integration +* Docker support excludes training, customization, and integration +* Running multiple instances of Docker Desktop on a single machine ->Note +> [!NOTE] > -> Support for [running Docker Desktop in a VM or VDI environment](vm-vdi.md) is only available to Docker Business customers. +> Support for [running Docker Desktop in a VM or VDI environment](/manuals/desktop/setup/vm-vdi.md) is only available to Docker Business customers. ### What versions are supported? -We currently only offer support for the latest version of Docker Desktop. If you are running an older version, you may be asked to upgrade before we investigate your support request. +For Docker Business customers, Docker offers support for versions up to six months older than the latest version, although any fixes will be on the latest version. + +For Pro and Team customers, Docker only offers support for the latest version of Docker Desktop. If you are running an older version, Docker may ask you to update before investigating your support request. ### How many machines can I get support for Docker Desktop on? @@ -76,9 +90,9 @@ As a Team, you can get support for Docker Desktop for the number of machines equ Docker Desktop is available for Mac, Linux, and Windows. The supported version information can be found on the following pages: -* [Mac system requirements](install/mac-install.md#system-requirements) -* [Windows system requirements](install/windows-install.md#system-requirements) -* [Linux system requirements](install/linux/_index.md#system-requirements) +* [Mac system requirements](/manuals/desktop/setup/install/mac-install.md#system-requirements) +* [Windows system requirements](/manuals/desktop/setup/install/windows-install.md#system-requirements) +* [Linux system requirements](/manuals/desktop/setup/install/linux/_index.md#system-requirements) ### How is personal diagnostic data handled in Docker Desktop? diff --git a/content/manuals/desktop/troubleshoot/_index.md b/content/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md similarity index 96% rename from content/manuals/desktop/troubleshoot/_index.md rename to content/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md index c0ebc8863996..fb3a5e76bfda 100644 --- a/content/manuals/desktop/troubleshoot/_index.md +++ b/content/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md @@ -15,8 +15,9 @@ aliases: - /docker-for-win/troubleshoot/ - /docker-for-windows/troubleshoot/ - /desktop/troubleshoot/overview/ +- /desktop/troubleshoot/ tags: [ Troubleshooting ] -weight: 160 +weight: 10 --- This page contains information on how to diagnose and troubleshoot Docker Desktop, and how to check the logs. @@ -25,14 +26,14 @@ This page contains information on how to diagnose and troubleshoot Docker Deskto To navigate to **Troubleshoot** either: -- Select the Docker menu Docker menu {{< inline-image src="../images/whale-x.svg" alt="whale menu" >}} and then **Troubleshoot**. +- Select the Docker menu Docker menu {{< inline-image src="../../images/whale-x.svg" alt="whale menu" >}} and then **Troubleshoot**. - Select the **Troubleshoot** icon near the top-right corner of Docker Dashboard. The **Troubleshooting** menu contains the following options: - **Restart Docker Desktop**. -- **Reset Kubernetes cluster**. Select to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](/manuals/desktop/settings.md#kubernetes). +- **Reset Kubernetes cluster**. Select to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](/manuals/desktop/settings-and-maintenance/settings.md#kubernetes). - **Clean / Purge data**. This option resets all Docker data without a reset to factory defaults. Selecting this option results in the loss of existing settings. @@ -65,7 +66,7 @@ If you are a Mac or Linux user, you also have the option to **Uninstall** Docker - If you have a paid Docker subscription, select **Contact support**. This opens the Docker Desktop support form. Fill in the information required and add the ID you copied in step three to the **Diagnostics ID field**. Then, select **Submit ticket** to request Docker Desktop support. > [!NOTE] > - > You must be signed in to Docker Desktop to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](../../support/_index.md). + > You must be signed in to Docker Desktop to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](/manuals/desktop/troubleshoot-and-support/support.md). - If you don't have a paid Docker subscription, select **Report a Bug** to open a new Docker Desktop issue on GitHub. Complete the information required and ensure you add the diagnostic ID you copied in step three. ### Diagnose from an error message @@ -76,7 +77,7 @@ If you are a Mac or Linux user, you also have the option to **Uninstall** Docker - If you have a paid Docker subscription, select **Contact support**. This opens the Docker Desktop support form. Fill in the information required and add the ID you copied in step three to the **Diagnostics ID field**. Then, select **Submit ticket** to request Docker Desktop support. > [!NOTE] > - > You must be signed in to Docker Desktop to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](../../support/_index.md). + > You must be signed in to Docker Desktop to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](/manuals/desktop/troubleshoot-and-support/support.md). - If you don't have a paid Docker subscription, you can open a new Docker Desktop issue on GitHub for [Mac](https://github.com/docker/for-mac/issues), [Windows](https://github.com/docker/for-win/issues), or [Linux](https://github.com/docker/for-linux/issues). Complete the information required and ensure you add the diagnostic ID printed in step two. ### Diagnose from the terminal diff --git a/content/manuals/desktop/troubleshoot/known-issues.md b/content/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md similarity index 100% rename from content/manuals/desktop/troubleshoot/known-issues.md rename to content/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md diff --git a/content/manuals/desktop/troubleshoot/topics.md b/content/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md similarity index 93% rename from content/manuals/desktop/troubleshoot/topics.md rename to content/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md index 03295f3b299a..2a89e76a5385 100644 --- a/content/manuals/desktop/troubleshoot/topics.md +++ b/content/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md @@ -57,7 +57,7 @@ After updating the `settings-store.json` file, close and restart Docker Desktop If you are using mounted volumes and get runtime errors indicating an application file is not found, access to a volume mount is denied, or a service cannot start, such as when using [Docker Compose](/manuals/compose/gettingstarted.md), -you might need to turn on [file sharing](/manuals/desktop/settings.md#file-sharing). +you might need to turn on [file sharing](/manuals/desktop/settings-and-maintenance/settings.md#file-sharing). Volume mounting requires shared drives for projects that live outside of the `/home/` directory. From **Settings**, select **Resources** and then **File sharing**. Share the drive that contains the Dockerfile and volume. @@ -103,7 +103,7 @@ If not, the command prints `kern.hv_support: 0`. See also, [Hypervisor Framework Reference](https://developer.apple.com/library/mac/documentation/DriversKernelHardware/Reference/Hypervisor/) -in the Apple documentation, and Docker Desktop [Mac system requirements](../install/mac-install.md#system-requirements). +in the Apple documentation, and Docker Desktop [Mac system requirements](/manuals/desktop/setup/install/mac-install.md#system-requirements). ### VPNKit keeps breaking @@ -117,7 +117,7 @@ To continue using VPNKit, add `"networkType":"vpnkit"` to your `settings-store.j #### Permissions errors on data directories for shared volumes -When sharing files from Windows, Docker Desktop sets permissions on [shared volumes](/manuals/desktop/settings.md#file-sharing) +When sharing files from Windows, Docker Desktop sets permissions on [shared volumes](/manuals/desktop/settings-and-maintenance/settings.md#file-sharing) to a default value of [0777](https://chmodcommand.com/chmod-0777/) (`read`, `write`, `execute` permissions for `user` and for `group`). @@ -128,7 +128,7 @@ volumes or find a way to make the applications work with the default file permissions. See also, -[Can I change permissions on shared volumes for container-specific deployment requirements?](../faqs/windowsfaqs.md#can-i-change-permissions-on-shared-volumes-for-container-specific-deployment-requirements) +[Can I change permissions on shared volumes for container-specific deployment requirements?](/manuals/desktop/troubleshoot-and-support/faqs/windowsfaqs.md#can-i-change-permissions-on-shared-volumes-for-container-specific-deployment-requirements) in the FAQs. #### Volume mounting requires shared folders for Linux containers @@ -136,14 +136,14 @@ in the FAQs. If you are using mounted volumes and get runtime errors indicating an application file is not found, access is denied to a volume mount, or a service cannot start, such as when using [Docker Compose](/manuals/compose/gettingstarted.md), -you might need to turn on [shared folders](/manuals/desktop/settings.md#file-sharing). +you might need to turn on [shared folders](/manuals/desktop/settings-and-maintenance/settings.md#file-sharing). With the Hyper-V backend, mounting files from Windows requires shared folders for Linux containers. From **Settings**, select **Shared Folders** and share the folder that contains the Dockerfile and volume. #### Support for symlinks -Symlinks work within and across containers. To learn more, see [How do symlinks work on Windows?](../faqs/windowsfaqs.md#how-do-symlinks-work-on-windows). +Symlinks work within and across containers. To learn more, see [How do symlinks work on Windows?](/manuals/desktop/troubleshoot-and-support/faqs/windowsfaqs.md#how-do-symlinks-work-on-windows). #### Avoid unexpected syntax errors, use Unix style line endings for files in containers @@ -290,7 +290,7 @@ In the subsequent screen, verify that Hyper-V is enabled. #### Virtualization must be turned on -In addition to [Hyper-V](#hyper-v) or [WSL 2](../wsl/_index.md), virtualization must be turned on. Check the +In addition to [Hyper-V](#hyper-v) or [WSL 2](/manuals/desktop/wsl/_index.md), virtualization must be turned on. Check the Performance tab on the Task Manager. Alternatively, you can type 'systeminfo' into your terminal. If you see 'Hyper-V Requirements: A hypervisor has been detected. Features required for Hyper-V will not be displayed', then virtualization is enabled. ![Task Manager](../images/virtualization-enabled.png) @@ -298,7 +298,7 @@ Performance tab on the Task Manager. Alternatively, you can type 'systeminfo' in If you manually uninstall Hyper-V, WSL 2 or turn off virtualization, Docker Desktop cannot start. -To turn on nested virtualization, see [Run Docker Desktop for Windows in a VM or VDI environment](../vm-vdi.md#turn-on-nested-virtualization). +To turn on nested virtualization, see [Run Docker Desktop for Windows in a VM or VDI environment](/manuals/desktop/setup/vm-vdi.md#turn-on-nested-virtualization). #### Hypervisor enabled at Windows startup @@ -321,13 +321,13 @@ If you are using Hyper-V and you get the following error message when running Do The Virtual Machine Management Service failed to start the virtual machine 'DockerDesktopVM' because one of the Hyper-V components is not running ``` -Try [enabling nested virtualization](../vm-vdi.md#turn-on-nested-virtualization). +Try [enabling nested virtualization](/manuals/desktop/setup/vm-vdi.md#turn-on-nested-virtualization). ### Windows containers and Windows Server Docker Desktop is not supported on Windows Server. If you have questions about how to run Windows containers on Windows 10, see -[Switch between Windows and Linux containers](../faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). +[Switch between Windows and Linux containers](/manuals/desktop/troubleshoot-and-support/faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). A full tutorial is available in [docker/labs](https://github.com/docker/labs) on [Getting Started with Windows Containers](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md). diff --git a/content/manuals/desktop/troubleshoot/workarounds.md b/content/manuals/desktop/troubleshoot-and-support/troubleshoot/workarounds.md similarity index 100% rename from content/manuals/desktop/troubleshoot/workarounds.md rename to content/manuals/desktop/troubleshoot-and-support/troubleshoot/workarounds.md diff --git a/content/manuals/desktop/uninstall.md b/content/manuals/desktop/uninstall.md index 8551bfa7615b..d394967be919 100644 --- a/content/manuals/desktop/uninstall.md +++ b/content/manuals/desktop/uninstall.md @@ -10,7 +10,7 @@ weight: 210 > > Uninstalling Docker Desktop destroys Docker containers, images, volumes, and > other Docker-related data local to the machine, and removes the files generated -> by the application. To learn how to preserve important data before uninstalling, refer to the [back up and restore data](backup-and-restore.md) section . +> by the application. To learn how to preserve important data before uninstalling, refer to the [back up and restore data](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) section . {{< tabs >}} {{< tab name="Windows" >}} diff --git a/content/manuals/desktop/use-desktop/builds.md b/content/manuals/desktop/use-desktop/builds.md index 4d0b066dd35b..ed469449a258 100644 --- a/content/manuals/desktop/use-desktop/builds.md +++ b/content/manuals/desktop/use-desktop/builds.md @@ -211,4 +211,4 @@ The **Builder settings** view in the Docker Desktop settings lets you: ![Builder settings drop-down](../images/build-ui-manage-builders.webp) -For more information about managing builders, see [Change settings](/manuals/desktop/settings.md#builders) +For more information about managing builders, see [Change settings](/manuals/desktop/settings-and-maintenance/settings.md#builders) diff --git a/content/manuals/desktop/vmm.md b/content/manuals/desktop/vmm.md index bffad295014e..132ad7af4dc6 100644 --- a/content/manuals/desktop/vmm.md +++ b/content/manuals/desktop/vmm.md @@ -11,7 +11,7 @@ description: Discover Docker Desktop for Mac's Virtual Machine Manager (VMM) opt weight: 150 --- -The Virtual Machine Manager (VMM) in Docker Desktop for Mac is responsible for creating and managing the virtual machine used to run containers. Depending on your system architecture and performance needs, you can choose from multiple VMM options in Docker Desktop's [settings](/manuals/desktop/settings.md#general). This page provides an overview of the available options. +The Virtual Machine Manager (VMM) in Docker Desktop for Mac is responsible for creating and managing the virtual machine used to run containers. Depending on your system architecture and performance needs, you can choose from multiple VMM options in Docker Desktop's [settings](/manuals/desktop/settings-and-maintenance/settings.md#general). This page provides an overview of the available options. ## Docker VMM (Beta) diff --git a/content/manuals/desktop/wsl/_index.md b/content/manuals/desktop/wsl/_index.md index 40e22fad773a..383563a3ded0 100644 --- a/content/manuals/desktop/wsl/_index.md +++ b/content/manuals/desktop/wsl/_index.md @@ -23,7 +23,7 @@ Additionally, with WSL 2, the time required to start a Docker daemon after a col Before you turn on the Docker Desktop WSL 2 feature, ensure you have: - At a minimum WSL version 1.1.3.0., but ideally the latest version of WSL to [avoid Docker Desktop not working as expected](best-practices.md). -- Met the Docker Desktop for Windows' [system requirements](https://docs.docker.com/desktop/install/windows-install/#system-requirements). +- Met the Docker Desktop for Windows' [system requirements](/manuals/desktop/setup/install/windows-install.md#system-requirements). - Installed the WSL 2 feature on Windows. For detailed instructions, refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10). > [!TIP] @@ -55,7 +55,7 @@ Now `docker` commands work from Windows using the new WSL 2 engine. > > By default, Docker Desktop stores the data for the WSL 2 engine at `C:\Users\[USERNAME]\AppData\Local\Docker\wsl`. > If you want to change the location, for example, to another drive you can do so via the `Settings -> Resources -> Advanced` page from the Docker Dashboard. -> Read more about this and other Windows settings at [Changing settings](/manuals/desktop/settings.md) +> Read more about this and other Windows settings at [Changing settings](/manuals/desktop/settings-and-maintenance/settings.md) ## Enabling Docker support in WSL 2 distros diff --git a/content/manuals/engine/cli/proxy.md b/content/manuals/engine/cli/proxy.md index bcda40f3d7ad..050c4160ec00 100644 --- a/content/manuals/engine/cli/proxy.md +++ b/content/manuals/engine/cli/proxy.md @@ -12,7 +12,7 @@ This page describes how to configure the Docker CLI to use proxies via environment variables in containers. This page doesn't describe how to configure proxies for Docker Desktop. -For instructions, see [configuring Docker Desktop to use HTTP/HTTPS proxies](/manuals/desktop/settings.md#proxies). +For instructions, see [configuring Docker Desktop to use HTTP/HTTPS proxies](/manuals/desktop/settings-and-maintenance/settings.md#proxies). If you're running Docker Engine without Docker Desktop, refer to [Configure the Docker daemon to use a proxy](/manuals/engine/daemon/proxy.md) diff --git a/content/manuals/engine/daemon/_index.md b/content/manuals/engine/daemon/_index.md index fd93053b0fd1..3b1ee08307a0 100644 --- a/content/manuals/engine/daemon/_index.md +++ b/content/manuals/engine/daemon/_index.md @@ -33,7 +33,7 @@ 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 [settings page](/manuals/desktop/settings.md#docker-engine). +> using Docker Desktop, refer to the [settings page](/manuals/desktop/settings-and-maintenance/settings.md#docker-engine). ## Configure the Docker daemon diff --git a/content/manuals/engine/daemon/proxy.md b/content/manuals/engine/daemon/proxy.md index 158feecf85ab..d2a4a7ebfe2d 100644 --- a/content/manuals/engine/daemon/proxy.md +++ b/content/manuals/engine/daemon/proxy.md @@ -26,7 +26,7 @@ Docker CLI to use a proxy server](/manuals/engine/cli/proxy.md). > [!IMPORTANT] > Proxy configurations specified in the `daemon.json` are ignored by Docker > Desktop. If you use Docker Desktop, you can configure proxies using the -> [Docker Desktop settings](/manuals/desktop/settings.md#proxies). +> [Docker Desktop settings](/manuals/desktop/settings-and-maintenance/settings.md#proxies). There are two ways you can configure these settings: diff --git a/content/manuals/engine/install/_index.md b/content/manuals/engine/install/_index.md index b67dbdef795d..58d73fc6f163 100644 --- a/content/manuals/engine/install/_index.md +++ b/content/manuals/engine/install/_index.md @@ -37,9 +37,9 @@ This section describes how to install Docker Engine on Linux, also known as Docker CE. Docker Engine is also available for Windows, macOS, and Linux, through Docker Desktop. For instructions on how to install Docker Desktop, see: -- [Docker Desktop for Linux](/manuals/desktop/install/linux/_index.md) -- [Docker Desktop for Mac (macOS)](/manuals/desktop/install/mac-install.md) -- [Docker Desktop for Windows](/manuals/desktop/install/windows-install.md) +- [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md) +- [Docker Desktop for Mac (macOS)](/manuals/desktop/setup/install/mac-install.md) +- [Docker Desktop for Windows](/manuals/desktop/setup/install/windows-install.md) ## Supported platforms diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index 47f635399a90..71c464516d61 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -86,7 +86,7 @@ clean installation, and prefer to clean up any existing data, read the You can install Docker Engine in different ways, depending on your needs: - Docker Engine comes bundled with - [Docker Desktop for Linux](/manuals/desktop/install/linux/_index.md). This is + [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md). This is the easiest and quickest way to get started. - Set up and install Docker Engine from diff --git a/content/manuals/engine/install/raspberry-pi-os.md b/content/manuals/engine/install/raspberry-pi-os.md index f9e5b2d7d010..3d2aa680d4e3 100644 --- a/content/manuals/engine/install/raspberry-pi-os.md +++ b/content/manuals/engine/install/raspberry-pi-os.md @@ -87,7 +87,7 @@ clean installation, and prefer to clean up any existing data, read the You can install Docker Engine in different ways, depending on your needs: - Docker Engine comes bundled with - [Docker Desktop for Linux](/manuals/desktop/install/linux/_index.md). This is + [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md). This is the easiest and quickest way to get started. - Set up and install Docker Engine from diff --git a/content/manuals/engine/install/ubuntu.md b/content/manuals/engine/install/ubuntu.md index 295bc5c1f7cb..68665f1ab024 100644 --- a/content/manuals/engine/install/ubuntu.md +++ b/content/manuals/engine/install/ubuntu.md @@ -96,7 +96,7 @@ clean installation, and prefer to clean up any existing data, read the You can install Docker Engine in different ways, depending on your needs: - Docker Engine comes bundled with - [Docker Desktop for Linux](/manuals/desktop/install/linux/_index.md). This is + [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md). This is the easiest and quickest way to get started. - Set up and install Docker Engine from diff --git a/content/manuals/engine/security/userns-remap.md b/content/manuals/engine/security/userns-remap.md index bc58ded55adc..57dfe29986bc 100644 --- a/content/manuals/engine/security/userns-remap.md +++ b/content/manuals/engine/security/userns-remap.md @@ -264,7 +264,7 @@ daemon with user namespaces enabled: User namespaces are an advanced feature and require coordination with other capabilities. For example, if volumes are mounted from the host, file ownership -must be pre-arranged need read or write access to the volume contents. +must be pre-arranged if you need read or write access to the volume contents. While the root user inside a user-namespaced container process has many of the expected privileges of the superuser within the container, the Linux kernel diff --git a/content/manuals/engine/storage/bind-mounts.md b/content/manuals/engine/storage/bind-mounts.md index 8681bada27c4..570b3cd04eec 100644 --- a/content/manuals/engine/storage/bind-mounts.md +++ b/content/manuals/engine/storage/bind-mounts.md @@ -100,7 +100,7 @@ on your development host. Use the following command to bind-mount the `target/` directory into your container at `/app/`. Run the command from within the `source` directory. The `$(pwd)` sub-command expands to the current working directory on Linux or macOS hosts. -If you're on Windows, see also [Path conversions on Windows](/manuals/desktop/troubleshoot/topics.md). +If you're on Windows, see also [Path conversions on Windows](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md). The `--mount` and `-v` examples below produce the same result. You can't run them both unless you remove the `devtest` container after running the diff --git a/content/manuals/scout/integrations/environment/sysdig.md b/content/manuals/scout/integrations/environment/sysdig.md index 38bf50657e2c..c2430eaa0a5b 100644 --- a/content/manuals/scout/integrations/environment/sysdig.md +++ b/content/manuals/scout/integrations/environment/sysdig.md @@ -1,8 +1,8 @@ --- title: Integrate Docker Scout with Sysdig linkTitle: Sysdig -description: scout, sysdig, integration, image analysis, environments, supply chain -keywords: Integrate your runtime environments with Docker Scout using Sysdig +description: Integrate your runtime environments with Docker Scout using Sysdig +keywords: scout, sysdig, integration, image analysis, environments, supply chain --- {{< include "scout-early-access.md" >}} diff --git a/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md b/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md index fa8763e15705..0b156169caa7 100644 --- a/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md +++ b/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md @@ -62,7 +62,7 @@ The new Registry Access Management policy takes effect after the developer succe There are certain limitations when using Registry Access Management: -- Windows image pulls and image builds are not restricted by default. For Registry Access Management to take effect on Windows Container mode, you must allow the Windows Docker daemon to use Docker Desktop's internal proxy by selecting the [Use proxy for Windows Docker daemon](/manuals/desktop/settings.md#proxies) setting. +- Windows image pulls and image builds are not restricted by default. For Registry Access Management to take effect on Windows Container mode, you must allow the Windows Docker daemon to use Docker Desktop's internal proxy by selecting the [Use proxy for Windows Docker daemon](/manuals/desktop/settings-and-maintenance/settings.md#proxies) setting. - Builds such as `docker buildx` using a Kubernetes driver are not restricted - Builds such as `docker buildx` using a custom docker-container driver are not restricted - Blocking is DNS-based; you must use a registry's access control mechanisms to distinguish between “push” and “pull” diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/_index.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/_index.md index 03cd8324bf10..a9807becaca8 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/_index.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/_index.md @@ -66,7 +66,7 @@ without it and the feature will take effect. Enforcing sign-in guarantees the feature always takes effect. -Next, you must either manually [create and configure the admin-settings.json file](configure.md), or use the `--admin-settings` installer flag on [macOS](/manuals/desktop/install/mac-install.md#install-from-the-command-line) or [Windows](/manuals/desktop/install/windows-install.md#install-from-the-command-line) to automatically create the `admin-settings.json` and save it in the correct location. +Next, you must either manually [create and configure the admin-settings.json file](configure.md), or use the `--admin-settings` installer flag on [macOS](/manuals/desktop/setup/install/mac-install.md#install-from-the-command-line) or [Windows](/manuals/desktop/setup/install/windows-install.md#install-from-the-command-line) to automatically create the `admin-settings.json` and save it in the correct location. Once this is done, Docker Desktop developers receive the changed settings when they either: - Quit, re-launch, and sign in to Docker Desktop diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure.md index 01e34698c583..82e452c7e78f 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure.md @@ -30,7 +30,7 @@ Settings Management is designed specifically for organizations who don’t give ### Step one: Create the `admin-settings.json` file and save it in the correct location -You can either use the `--admin-settings` installer flag on [macOS](/manuals/desktop/install/mac-install.md#install-from-the-command-line) or [Windows](/manuals/desktop/install/windows-install.md#install-from-the-command-line) to automatically create the `admin-settings.json` and save it in the correct location, or set it up manually. +You can either use the `--admin-settings` installer flag on [macOS](/manuals/desktop/setup/install/mac-install.md#install-from-the-command-line) or [Windows](/manuals/desktop/setup/install/windows-install.md#install-from-the-command-line) to automatically create the `admin-settings.json` and save it in the correct location, or set it up manually. To set it up manually: 1. Create a new, empty JSON file and name it `admin-settings.json`. diff --git a/content/manuals/security/for-developers/access-tokens.md b/content/manuals/security/for-developers/access-tokens.md index a7af86ee1666..0cbb62c85538 100644 --- a/content/manuals/security/for-developers/access-tokens.md +++ b/content/manuals/security/for-developers/access-tokens.md @@ -14,8 +14,7 @@ Compared to passwords, PATs provide the following advantages: - You can investigate when the PAT was last used and then disable or delete it if you find any suspicious activity. - When using an access token, you can't perform any administrative activity on the account, including changing the password. It protects your account if your computer is compromised. - -Access tokens are also valuable for building integrations, as you can issue multiple tokens, one for each integration, and revoke them at +- Access tokens are valuable for building integrations, as you can issue multiple tokens, one for each integration, and revoke them at any time. ## Create an access token @@ -24,6 +23,8 @@ any time. > > Treat access tokens like your password and keep them secret. Store your tokens securely in a credential manager for example. +Use the Docker Admin Console to create an access token. + 1. Sign in to your [Docker account](https://app.docker.com/login). 2. Select your avatar in the top-right corner and from the drop-down menu select **Account settings**. @@ -34,14 +35,15 @@ any time. 5. Add a description for your token. Use something that indicates the use case or purpose of the token. -6. Set the access permissions. +6. Select the expiration date for the token. + +7. Set the access permissions. The access permissions are scopes that set restrictions in your repositories. For example, for Read & Write permissions, an automation pipeline can build an image and then push it to a repository. However, it can't delete the repository. -7. Select **Generate** and then copy the token that appears on the screen and save it. You won't be able - to retrieve the token once you close this prompt. +8. Select **Generate** and then copy the token that appears on the screen and save it. You won't be able to retrieve the token once you close this prompt. ## Use an access token @@ -63,6 +65,10 @@ When prompted for a password, enter your personal access token instead of a pass ## Modify existing tokens +> [!NOTE] +> +> You can't edit the expiration date on an existing token. You must create a new PAT if you need to set a new expiration date. + You can rename, activate, deactivate, or delete a token as needed. You can manage your tokens in your account settings. 1. Sign in to your [Docker account](https://app.docker.com/login). diff --git a/content/manuals/security/security-announcements.md b/content/manuals/security/security-announcements.md index ddabcc750816..f98c6c0dbe52 100644 --- a/content/manuals/security/security-announcements.md +++ b/content/manuals/security/security-announcements.md @@ -111,7 +111,7 @@ _The issue has been fixed in Moby >= v25.0.2 and >= v24.0.9._ Docker Desktop v4.27.0 and earlier are affected. Docker Desktop v4.27.1 was released on February 1 and includes runc, BuildKit, and dockerd binaries patches. In addition to updating to this new version, we encourage all Docker users to diligently use Docker images and Dockerfiles and ensure you only use trusted content in your builds. -As always, you should check Docker Desktop system requirements for your operating system ([Windows](/manuals/desktop/install/windows-install.md#system-requirements), [Linux](/manuals/desktop/install/linux/_index.md#general-system-requirements), [Mac](/manuals/desktop/install/mac-install.md#system-requirements)) before updating to ensure full compatibility. +As always, you should check Docker Desktop system requirements for your operating system ([Windows](/manuals/desktop/setup/install/windows-install.md#system-requirements), [Linux](/manuals/desktop/setup/install/linux/_index.md#general-system-requirements), [Mac](/manuals/desktop/setup/install/mac-install.md#system-requirements)) before updating to ensure full compatibility. #### Docker Build Cloud diff --git a/content/manuals/support.md b/content/manuals/support.md deleted file mode 100644 index afad26228d5f..000000000000 --- a/content/manuals/support.md +++ /dev/null @@ -1,101 +0,0 @@ ---- -description: Get support -keywords: Support, Docker Desktop, Docker Hub, Hub, Linux, Mac, Windows -title: Get support -aliases: -- /desktop/support/ ---- - -Find information on how to get support, and the scope of support. - -## How do I get support? - -If you have a paid Docker subscription, you can [contact the Support team](https://hub.docker.com/support/contact/). - -All Docker users can seek support through the following resources, where Docker or the community respond on a best effort basis. - - [Docker Desktop for Windows GitHub repo](https://github.com/docker/for-win) - - [Docker Desktop for Mac GitHub repo](https://github.com/docker/for-mac) - - [Docker Desktop for Linux GitHub repo](https://github.com/docker/desktop-linux) - - [Docker Community Forums](https://forums.docker.com/) - - [Docker Community Slack](http://dockr.ly/comm-slack) - - -## What support can I get? - -If you have a paid Docker subscription, you can get support for the following types of issues: - - * Account management related issues - * Automated builds - * Basic product 'how to' questions - * Billing or subscription issues - * Configuration issues - * Desktop installation issues - * Installation crashes - * Failure to launch Docker Desktop on first run - * Desktop update issues - * Sign-in issues in both the command line interface and Docker Hub user interface - * Push or pull issues, including rate limiting - * Usage issues - * Crash closing software - * Docker Desktop not behaving as expected - - For Windows users, you can also request support on: - * Turning on virtualization in BIOS - * Turning on Windows features - * Running inside [certain VM or VDI environments](/manuals/desktop/vm-vdi.md) (Docker Business customers only) - - -## What is not supported? - -Docker excludes support for the following types of issues: - * Altered or modified Docker software - * Any version of the Docker software other than the latest version - * Defects in the Docker software due to hardware malfunction, abuse, or improper use - * Docker support excludes training, customization, and integration - * Features labeled as experimental or beta - * Reimbursing and expenses spent for third-party services not provided by Docker - * Routine product maintenance (data backup, cleaning disk space and configuring log rotation) - * Running containers of a different architecture using emulation - * Running on unsupported operating systems, including beta or preview versions of operating systems - * Scale deployment/multi-machine installation of Desktop - * Support for Kubernetes - * Support for the Docker Engine, Docker CLI, or other bundled Linux components - * Supporting Desktop as a production runtime - * System/Server administration activities - * Third-party applications not provided by Docker - * Use on or in conjunction with hardware or software other than that specified in the applicable documentation - * Running multiple instances of Docker Desktop on a single machine - -## What Docker Desktop versions are supported? - -For Docker Business customers, Docker offers support for versions up to six months older than the latest version, although any fixes will be on the latest version. - -For Pro and Team customers, Docker only offers support for the latest version of Docker Desktop. If you are running an older version, Docker may ask you to update before investigating your support request. - -## How many machines can I get support for Docker Desktop on? - -As a Pro user you can get support for Docker Desktop on a single machine. -As a Team user, you can get support for Docker Desktop for the number of machines equal to the number of seats as part of your plan. - -## What OS’s are supported? - -Docker Desktop is available for Mac, Linux, and Windows. The supported version information can be found on the following pages: - -* [Mac system requirements](/manuals/desktop/install/mac-install.md#system-requirements) -* [Windows system requirements](/manuals/desktop/install/windows-install.md#system-requirements) -* [Linux system requirements](/manuals/desktop/install/linux/_index.md#system-requirements) - -## How is personal diagnostic data handled in Docker Desktop? - -When uploading diagnostics to help Docker with investigating issues, the uploaded diagnostics bundle may contain personal data such as usernames and IP addresses. The diagnostics bundles are only accessible to Docker, Inc. -employees who are directly involved in diagnosing Docker Desktop issues. - -By default, Docker, Inc. will delete uploaded diagnostics bundles after 30 days. You may also request the removal of a diagnostics bundle by either specifying the diagnostics ID or via your GitHub ID (if the diagnostics ID is mentioned in a GitHub issue). Docker, Inc. will only use the data in the diagnostics bundle to investigate specific user issues but may derive high-level (non personal) metrics such as the rate of issues from it. - -For more information, see [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement). - -## What can I do before seeking support? - -Before seeking support, you can perform basic troubleshooting. See [Diagnose and troubleshooting](/manuals/desktop/troubleshoot/_index.md) for more information. - -You can also see if an answer already exists in the [FAQs](/tags/faq/). diff --git a/data/redirects.yml b/data/redirects.yml index d3a3d121f461..656a68c5dcb5 100644 --- a/data/redirects.yml +++ b/data/redirects.yml @@ -88,7 +88,7 @@ "/desktop/use-desktop/pause/": - /go/mac-desktop-pause/ - /go/win-desktop-pause/ -"/desktop/settings/#file-sharing": +"/desktop/settings-and-maintenance/settings/#file-sharing": - /go/mac-file-sharing/ "/engine/security/rootless/": # Instructions on running docker in rootless mode. This redirect is currently diff --git a/layouts/index.redirects.json b/layouts/index.redirects.json index 8136b17c13aa..abf7111aca85 100644 --- a/layouts/index.redirects.json +++ b/layouts/index.redirects.json @@ -12,4 +12,5 @@ {{- $redirects.SetInMap "paths" . $target -}} {{- end -}} {{- end -}} -{{ $redirects.Get "paths" | jsonify }} +{{- $opts := dict "noHTMLEscape" true }} +{{- $redirects.Get "paths" | jsonify $opts }}