Merge pull request #14003 from docker/master

Publish updates from master

_config.yml

@@ -23,10 +23,12 @@ exclude: ["_samples", "_scripts", "404.html", "datacenter", "ee", "index.html",
 latest_engine_api_version: "1.41"
 docker_ce_version: "20.10"
 compose_version: "1.29.2"
+compose_v2_version: "2.2.2"
 compose_file_v3: "3.9"
 compose_file_v2: "2.4"
 machine_version: "0.16.0"
 distribution_version: "2.7"
+compose_switch_version:  "1.0.4"
 
 # List of plugins to enable for local development builds. Mostly the same as
 # for production, but without the "jekyll-sitemap" plugin, which is not needed

compose/cli-command.md

@@ -79,7 +79,7 @@ from the [project release page](https://github.com/docker/compose/releases){:tar
 
     ```console
     $ mkdir -p ~/.docker/cli-plugins/
-    $ curl -SL https://github.com/docker/compose/releases/download/v2.0.1/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
+    $ curl -SL https://github.com/docker/compose/releases/download/v{{site.compose_v2_version}}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
     ```
 
     This command installs Compose V2 for the active user under `$HOME` directory. To install Docker Compose for all users on your system, replace `~/.docker/cli-plugins` with `/usr/local/lib/docker/cli-plugins`.
@@ -94,7 +94,7 @@ from the [project release page](https://github.com/docker/compose/releases){:tar
 
     ```console
     $ docker compose version
-    Docker Compose version 2.0.1
+    Docker Compose version {{site.compose_v2_version}}
     ```
 
 ### Compose Switch
@@ -112,7 +112,7 @@ To install Compose Switch manually:
 1. Download the `compose-switch` binary for your architecture
 
     ```console
-    $ curl -fL https://github.com/docker/compose-switch/releases/download/v1.0.1/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch
+    $ curl -fL https://github.com/docker/compose-switch/releases/download/v{{site.compose_switch_version}}/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch
     ```
 
 2. Run the following command to make it an executable:

compose/networking.md

@@ -133,8 +133,8 @@ networks:
     # Use a custom driver which takes special options
     driver: custom-driver-2
     driver_opts:
-    foo: "1"
-    bar: "2"
+      foo: "1"
+      bar: "2"
 ```
 
 Networks can be configured with static IP addresses by setting the [ipv4_address and/or ipv6_address](compose-file/compose-file-v2.md#ipv4_address-ipv6_address) for each attached network.

desktop/multi-arch.md

@@ -17,7 +17,7 @@ selects the image variant that matches your OS and architecture.
 Most of the Docker Official Images on Docker Hub provide a [variety of architectures](https://github.com/docker-library/official-images#architectures-other-than-amd64){: target="_blank" rel="noopener" class="_" }.
 For example, the `busybox` image supports `amd64`, `arm32v5`, `arm32v6`,
 `arm32v7`, `arm64v8`, `i386`, `ppc64le`, and `s390x`. When running this image
-on an `x86_64` / `amd64` machine, the `x86_64` variant is pulled and run.
+on an `x86_64` / `amd64` machine, the `amd64` variant is pulled and run.
 
 ## Multi-arch support on Docker Desktop
 

engine/security/rootless.md

@@ -345,10 +345,11 @@ Add `net.ipv4.ping_group_range = 0   2147483647` to `/etc/sysctl.conf` (or
 
 ### Exposing privileged ports
 
-To expose privileged ports (< 1024), set `CAP_NET_BIND_SERVICE` on `rootlesskit` binary.
+To expose privileged ports (< 1024), set `CAP_NET_BIND_SERVICE` on `rootlesskit` binary and restart the daemon.
 
 ```console
-$ sudo setcap cap_net_bind_service=ep $HOME/bin/rootlesskit
+$ sudo setcap cap_net_bind_service=ep $(which rootlesskit)
+$ systemctl --user restart docker
 ```
 
 Or add `net.ipv4.ip_unprivileged_port_start=0` to `/etc/sysctl.conf` (or

engine/swarm/secrets.md

@@ -896,7 +896,7 @@ use it, then remove the old secret.
     ```
 
 4.  Update the `wordpress` service to use the new password, keeping the target
-    path at `/run/secrets/wp_db_secret` and keeping the file permissions at
+    path at `/run/secrets/wp_db_password` and keeping the file permissions at
     `0400`.  This triggers a rolling restart of the WordPress service and
     the new secret is used.
 

get-started/02_our_app.md

@@ -45,7 +45,7 @@ see a few flaws in the Dockerfile below. But, don't worry. We'll go over them.
    ```dockerfile
    # syntax=docker/dockerfile:1
    FROM node:12-alpine
-   RUN apk add --no-cache python3 g++ make
+   RUN apk add --no-cache python2 g++ make
    WORKDIR /app
    COPY . .
    RUN yarn install --production

samples/wordpress.md

@@ -62,7 +62,7 @@ Compose to set up and run WordPress. Before starting, make sure you have
           - "8000:80"
         restart: always
         environment:
-          WORDPRESS_DB_HOST: db:3306
+          WORDPRESS_DB_HOST: db
           WORDPRESS_DB_USER: wordpress
           WORDPRESS_DB_PASSWORD: wordpress
           WORDPRESS_DB_NAME: wordpress