Merge pull request #13258 from docker/master

Publish updates from master

_data/toc.yaml

@@ -548,6 +548,8 @@ reference:
           title: docker compose build
         - path: /engine/reference/commandline/compose_convert/
           title: docker compose convert
+        - path: /engine/reference/commandline/compose_cp/
+          title: docker compose cp
         - path: /engine/reference/commandline/compose_create/
           title: docker compose create
         - path: /engine/reference/commandline/compose_down/
@@ -566,12 +568,16 @@ reference:
           title: docker compose ls
         - path: /engine/reference/commandline/compose_pause/
           title: docker compose pause
+        - path: /engine/reference/commandline/compose_port/
+          title: docker compose port
         - path: /engine/reference/commandline/compose_ps/
           title: docker compose ps
         - path: /engine/reference/commandline/compose_pull/
           title: docker compose pull
         - path: /engine/reference/commandline/compose_push/
           title: docker compose push
+        - path: /engine/reference/commandline/compose_restart/
+          title: docker compose restart
         - path: /engine/reference/commandline/compose_rm/
           title: docker compose rm
         - path: /engine/reference/commandline/compose_run/

_includes/enable-buildkit.md

@@ -2,13 +2,17 @@
 
 ### Enable BuildKit
 
-Before we start building images, ensure you have enabled BuildKit on your machine. BuildKit allows you to build Docker images efficiently. For more information, see [Building images with BuildKit](../develop/develop-images/build_enhancements.md).
+Before we start building images, ensure you have enabled BuildKit on your machine.
+BuildKit allows you to build Docker images efficiently. For more information,
+see [Building images with BuildKit](/develop/develop-images/build_enhancements/).
 
-BuildKit is enabled by default for all users on Docker Desktop. If you have installed Docker Desktop, you don't have to manually enable BuildKit. If you are running Docker on Linux, you can enable BuildKit either by using an environment variable or by making BuildKit the default setting.
+BuildKit is enabled by default for all users on Docker Desktop. If you have
+installed Docker Desktop, you don't have to manually enable BuildKit. If you are
+running Docker on Linux, you can enable BuildKit either by using an environment
+variable or by making BuildKit the default setting.
 
-> You must be running Docker 18.09 or higher to use BuildKit.
-
-To set the BuildKit environment variable when running the `docker build` command, run:
+To set the BuildKit environment variable when running the `docker build` command,
+run:
 
 ```
 $ DOCKER_BUILDKIT=1 docker build .

docker-hub/official_images.md

@@ -70,7 +70,7 @@ All Official Images contain a **User Feedback** section in their
 documentation which covers the details for that specific repository. In most
 cases, the GitHub repository which contains the Dockerfiles for an Official
 Repository also has an active issue tracker. General feedback and support
-questions should be directed to `#docker-library` on Freenode IRC.
+questions should be directed to `#docker-library` on [Libera.Chat IRC](https://libera.chat).
 
 ## Creating an Official Image
 

engine/reference/commandline/compose_cp.md

@@ -0,0 +1,12 @@
+---
+datafolder: compose-cli
+datafile: docker_compose_cp
+title: docker compose cp
+---
+<!--
+Sorry, but the contents of this page are automatically generated from
+Docker's source code. If you want to suggest a change to the text that appears
+here, you'll need to find the string by searching this repo:
+https://github.com/docker/compose-cli
+-->
+{% include cli.md datafolder=page.datafolder datafile=page.datafile %}

engine/reference/commandline/compose_port.md

@@ -0,0 +1,12 @@
+---
+datafolder: compose-cli
+datafile: docker_compose_port
+title: docker compose port
+---
+<!--
+Sorry, but the contents of this page are automatically generated from
+Docker's source code. If you want to suggest a change to the text that appears
+here, you'll need to find the string by searching this repo:
+https://github.com/docker/compose-cli
+-->
+{% include cli.md datafolder=page.datafolder datafile=page.datafile %}

engine/reference/commandline/compose_restart.md

@@ -0,0 +1,12 @@
+---
+datafolder: compose-cli
+datafile: docker_compose_restart
+title: docker compose restart
+---
+<!--
+Sorry, but the contents of this page are automatically generated from
+Docker's source code. If you want to suggest a change to the text that appears
+here, you'll need to find the string by searching this repo:
+https://github.com/docker/compose-cli
+-->
+{% include cli.md datafolder=page.datafolder datafile=page.datafile %}

get-started/orchestration.md

@@ -4,7 +4,7 @@ keywords: orchestration, deploy, kubernetes, swarm,
 description: Get oriented on some basics of Docker and install Docker Desktop.
 ---
 
-The portability and reproducibility of a containerized process mean we have an opportunity to move and scale our containerized applications across clouds and datacenters. Containers effectively guarantee that those applications run the same way anywhere, allowing us to quickly and easily take advantage of all these environments. Furthermore, as we scale our applications up, we'll want some tooling to help automate the maintenance of those applications, able to replace failed containers automatically, and manage the rollout of updates and reconfigurations of those containers during their lifecycle.
+The portability and reproducibility of a containerized process provides an opportunity to move and scale our containerized applications across clouds and datacenters. Containers effectively guarantee that those applications run the same way anywhere, allowing us to quickly and easily take advantage of all these environments. Additionally, as we scale our applications up, we need some tooling to help automate the maintenance of those applications, enable the replacement of failed containers automatically, and manage the rollout of updates and reconfigurations of those containers during their lifecycle.
 
 Tools to manage, scale, and maintain containerized applications are called _orchestrators_, and the most common examples of these are _Kubernetes_ and _Docker Swarm_. Development environment deployments of both of these
 orchestrators are provided by Docker Desktop, which we'll use throughout

language/golang/deploy.md

@@ -12,7 +12,7 @@ Now, that we have configured a CI/CD pipleline, let's look at how we can deploy
 
 The Docker Azure Integration enables developers to use native Docker commands to run applications in Azure Container Instances (ACI) when building cloud-native applications. The new experience provides a tight integration between Docker Desktop and Microsoft Azure allowing developers to quickly run applications using the Docker CLI or VS Code extension, to switch seamlessly from local development to cloud deployment.
 
-For detailed instructions, see [Deploying Docker containers on Azure](/cloud/aci-integration/).
+For detailed instructions, see [Deploying Docker containers on Azure](../../cloud/aci-integration.md).
 
 ## Docker and AWS ECS
 

language/nodejs/develop.md

@@ -198,7 +198,7 @@ Click the **Open dedicated DevTools for Node** link. This opens the DevTools tha
 
 Let’s change the source code and then set a breakpoint.
 
-Add the following code above the existing `server.use()` statement, and save the file.
+Add the following code above the existing `server.use()` statement, and save the file. Make sure that the `return` statement is on a line of its own, as shown here, so you can set the breakpoint appropriately.
 
 ```js
  server.use( '/foo', (req, res) => {

language/python/configure-ci-cd.md

@@ -135,8 +135,8 @@ Let us set up a Builder with a build cache. First, we need to set up cache for t
 
 And lastly, after adding the builder and build cache snippets to the top of the Actions file, we need to add some extra attributes to the build and push step. This involves:
 
-Setting up the builder to use the output of the buildx step, and then
-Using the cache we set up earlier for it to store to and to retrieve
+ - Setting up the builder to use the output of the buildx step, and then
+ - Using the cache we set up earlier for it to store to and to retrieve
 
 {% raw %}
 ```yaml