publish updates from main

_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

_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
 	}

content/get-started/get-docker.md

@@ -34,15 +34,15 @@ 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" >}}
 
 <br>
 
 {{< 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" >}}
 
 <br>

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" >}}
 
 <br>
 
 {{< 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" >}}
 
 <br>

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 >}}

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.

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.
 

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.
 

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

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.
 

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.
 

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.
 

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)

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). 

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). 
 

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
 

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.
 

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/

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