Sync from docker/docs@b0adb47 by PCIT

.github/workflows/build.yml

@@ -23,10 +23,10 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             docker-bake.hcl
@@ -49,10 +49,10 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Validate
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             docker-bake.hcl
@@ -72,10 +72,10 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             docker-bake.hcl

.github/workflows/deploy.yml

@@ -79,10 +79,10 @@ jobs:
           fetch-depth: 0
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Build website
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             docker-bake.hcl
@@ -106,7 +106,7 @@ jobs:
       -
         name: Update S3 config
         if: ${{ env.DOCS_S3_BUCKET != '' && env.DOCS_S3_CONFIG != '' }}
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             docker-bake.hcl
@@ -120,7 +120,7 @@ jobs:
       -
         name: Update Cloudfront config
         if: ${{ env.DOCS_CLOUDFRONT_ID != '' }}
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             docker-bake.hcl

SUMMARY.md

@@ -322,8 +322,8 @@
         * [Use A Logging Driver Plugin](content/config/containers/logging/plugins.md)
         * [Splunk Logging Driver](content/config/containers/logging/splunk.md)
         * [Syslog Logging Driver](content/config/containers/logging/syslog.md)
-      * [Keep Containers Alive During Daemon Downtime](content/config/containers/live-restore.md)
-      * [Run Multiple Services In A Container](content/config/containers/multi-service_container.md)
+      * [Live Restore](content/config/containers/live-restore.md)
+      * [Run Multiple Processes In A Container](content/config/containers/multi-service_container.md)
       * [Runtime Options With Memory CP Us And GP Us](content/config/containers/resource_constraints.md)
       * [Runtime Metrics](content/config/containers/runmetrics.md)
       * [Start Containers Automatically](content/config/containers/start-containers-automatically.md)
@@ -335,7 +335,7 @@
       * [Configure Remote Access For Docker Daemon](content/config/daemon/remote-access.md)
       * [Start The Daemon](content/config/daemon/start.md)
       * [Configure The Daemon With Systemd](content/config/daemon/systemd.md)
-      * [Troubleshoot The Docker Daemon](content/config/daemon/troubleshoot.md)
+      * [Troubleshooting The Docker Daemon](content/config/daemon/troubleshoot.md)
     * [Filter Commands](content/config/filter.md)
     * [Format Command And Log Output](content/config/formatting.md)
     * [Docker Object Labels](content/config/labels-custom-metadata.md)

_releaser/go.mod

@@ -44,8 +44,8 @@ require (
 	go.mongodb.org/mongo-driver v1.8.3 // indirect
 	go.opentelemetry.io/otel v1.11.1 // indirect
 	go.opentelemetry.io/otel/trace v1.11.1 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

_releaser/go.sum

@@ -446,8 +446,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -482,8 +482,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -496,8 +496,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

content/config/containers/live-restore.md

@@ -1,9 +1,9 @@
 ---
-description: How to keep containers running when the daemon isn't available.
+description: Learn how to keep containers running when the daemon isn't available
 keywords: docker, upgrade, daemon, dockerd, live-restore, daemonless container
-title: Keep containers alive during daemon downtime
+title: Live restore
 aliases:
-- /engine/admin/live-restore/
+  - /engine/admin/live-restore/
 ---
 
 By default, when the Docker daemon terminates, it shuts down running containers.
@@ -14,15 +14,15 @@ or upgrades.
 
 > **Note**
 >
-> Live restore is not supported on Windows containers, but it does work for
+> Live restore isn't supported for Windows containers, but it does work for
 > Linux containers running on Docker Desktop for Windows.
 
 ## Enable live restore
 
 There are two ways to enable the live restore setting to keep containers alive
 when the daemon becomes unavailable. **Only do one of the following**.
 
-* Add the configuration to the daemon configuration file. On Linux, this
+- Add the configuration to the daemon configuration file. On Linux, this
   defaults to `/etc/docker/daemon.json`. On Docker Desktop for Mac or Docker
   Desktop for Windows, select the Docker icon from the task bar, then click
   **Settings** -> **Docker Engine**.
@@ -40,12 +40,11 @@ when the daemon becomes unavailable. **Only do one of the following**.
     `systemd`, then use the command `systemctl reload docker`. Otherwise, send a
     `SIGHUP` signal to the `dockerd` process.
 
-* If you prefer, you can start the `dockerd` process manually with the
-  `--live-restore` flag. This approach is not recommended because it does not
+- If you prefer, you can start the `dockerd` process manually with the
+  `--live-restore` flag. This approach isn't recommended because it doesn't
   set up the environment that `systemd` or another process manager would use
   when starting the Docker process. This can cause unexpected behavior.
 
-
 ## Live restore during upgrades
 
 Live restore allows you to keep containers running across Docker daemon updates,
@@ -54,12 +53,12 @@ major (`YY.MM`) daemon upgrades.
 
 If you skip releases during an upgrade, the daemon may not restore its
 connection to the containers. If the daemon can't restore the connection, it
-cannot manage the running containers and you must stop them manually.
+can't manage the running containers and you must stop them manually.
 
 ## Live restore upon restart
 
 The live restore option only works to restore containers if the daemon options,
-such as bridge IP addresses and graph driver, did not change. If any of these
+such as bridge IP addresses and graph driver, didn't change. If any of these
 daemon-level configuration options have changed, the live restore may not work
 and you may need to manually stop the containers.
 
@@ -71,12 +70,12 @@ data. The default buffer size is 64K. If the buffers fill, you must restart
 the Docker daemon to flush them.
 
 On Linux, you can modify the kernel's buffer size by changing
-`/proc/sys/fs/pipe-max-size`. You cannot modify the buffer size on Docker Desktop for
+`/proc/sys/fs/pipe-max-size`. You can't modify the buffer size on Docker Desktop for
 Mac or Docker Desktop for Windows.
 
-## Live restore and swarm mode
+## Live restore and Swarm mode
 
-The live restore option only pertains to standalone containers, and not to swarm
-services. Swarm services are managed by swarm managers. If swarm managers are
-not available, swarm services continue to run on worker nodes but cannot be
-managed until enough swarm managers are available to maintain a quorum.
+The live restore option only pertains to standalone containers, and not to Swarm
+services. Swarm services are managed by Swarm managers. If Swarm managers are
+not available, Swarm services continue to run on worker nodes but can't be
+managed until enough Swarm managers are available to maintain a quorum.

content/config/containers/logging/_index.md

@@ -1,19 +1,19 @@
 ---
-description: How to write to and view a container's logs
+description: Learn how to write to, view, and configure a container's logs
 keywords: docker, logging
 title: View container logs
 aliases:
-- /engine/admin/logging/
-- /engine/admin/logging/view_container_logs/
+  - /engine/admin/logging/
+  - /engine/admin/logging/view_container_logs/
 ---
 
 The `docker logs` command shows information logged by a running container. The
 `docker service logs` command shows information logged by all containers
-participating in a service. The information that is logged and the format of the
+participating in a service. The information that's logged and the format of the
 log depends almost entirely on the container's endpoint command.
 
 By default, `docker logs` or `docker service logs` shows the command's output
-just as it would appear if you ran the command interactively in a terminal. UNIX
+just as it would appear if you ran the command interactively in a terminal. Unix
 and Linux commands typically open three I/O streams when they run, called
 `STDIN`, `STDOUT`, and `STDERR`. `STDIN` is the command's input stream, which
 may include input from the keyboard or input from another command. `STDOUT` is
@@ -50,4 +50,4 @@ its errors to `/proc/self/fd/2` (which is `STDERR`). See the
 ## Next steps
 
 - Configure [logging drivers](configure.md).
-- Write a [Dockerfile](../../../engine/reference/builder.md).
+- Write a [Dockerfile](../../../engine/reference/builder.md).