publish updates from main

content/guides/bun/configure-ci-cd.md

@@ -29,7 +29,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token)for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 
@@ -69,12 +69,12 @@ to Docker Hub.
 
    ```yaml
    name: ci
-   
+
    on:
      push:
        branches:
          - main
-   
+
    jobs:
      build:
        runs-on: ubuntu-latest

content/guides/cpp/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/deno/configure-ci-cd.md

@@ -29,7 +29,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token)for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/dotnet/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/golang/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/java/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/nodejs/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/php/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/python/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/r/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/guides/rust/configure-ci-cd.md

@@ -30,7 +30,7 @@ Create a GitHub repository, configure the Docker Hub credentials, and push your
 2. Open the repository **Settings**, and go to **Secrets and variables** >
    **Actions**.
 
-3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as value.
+3. Create a new **Repository variable** named `DOCKER_USERNAME` and your Docker ID as a value.
 
 4. Create a new [Personal Access Token (PAT)](/manuals/security/for-developers/access-tokens.md#create-an-access-token) for Docker Hub. You can name this token `docker-tutorial`. Make sure access permissions include Read and Write.
 

content/manuals/admin/organization/members.md

@@ -33,6 +33,14 @@ To accept an invitation:
 1. Navigate to your email inbox and open the Docker email with an invitation to
 join the Docker organization.
 2. To open the link to Docker Hub, select the **click here** link.
+
+   > [!WARNING]
+   >
+   > Invitation email links expire after 14 days. If your email link has expired,
+   > you can sign in to [Docker Hub](https://hub.docker.com/) with the email
+   > address the link was sent to and accept the invitation from the
+   > **Notifications** panel.
+
 3. The Docker create an account page will open. If you already have an account, select **Already have an account? Sign in**.
 If you do not have an account yet, create an account using the same email
 address you received the invitation through.

content/manuals/build/bake/overrides.md

@@ -63,7 +63,7 @@ If more than one Bake file is found, all files are loaded and merged into a
 single definition. Files are merged according to the lookup order.
 
 ```console
-$ docker buildx bake bake --print
+$ docker buildx bake --print
 [+] Building 0.0s (1/1) FINISHED                                                                                                                                                                                            
  => [internal] load local bake definitions                                                                                                                                                                             0.0s
  => => reading compose.yaml 45B / 45B                                                                                                                                                                                  0.0s

content/manuals/security/security-announcements.md

@@ -30,6 +30,16 @@ On September 16, 2024 the grace period will end and passwords will no longer be
 
 At Docker, we want the experience to be the most secure for our developers and organizations and this deprecation is an essential step in that direction.
 
+## SOC 2 Type 2 attestation and ISO 27001 certification
+
+_Last updated June, 2024_
+
+Docker is pleased to announce that we have received our SOC 2 Type 2 attestation and ISO 27001 certification with no exceptions or major non-conformities. 
+
+Security is a fundamental pillar to Docker’s operations, which is embedded into our overall mission and company strategy. Docker’s products are core to our user community and our SOC 2 Type 2 attestation and ISO 27001 certification demonstrate Docker’s ongoing commitment to security to our user base.
+
+For more information, see the [Blog announcement](https://www.docker.com/blog/docker-announces-soc-2-type-2-attestation-iso-27001-certification/).
+
 ## Docker Security Advisory: Multiple Vulnerabilities in runc, BuildKit, and Moby
 
 _Last updated February 2, 2024_

content/reference/cli/docker/debug.md

@@ -6,3 +6,5 @@ layout: cli
 aliases:
 - /engine/reference/commandline/debug/
 ---
+
+{{< summary-bar feature_name="Docker Debug" >}}

content/reference/cli/docker/init.md

@@ -7,10 +7,4 @@ aliases:
 - /engine/reference/commandline/init/
 ---
 
-<!--
-This page is automatically generated from Docker's source code. If you want to
-suggest a change to the text that appears here, open a ticket or pull request
-in the source repository on GitHub:
-
-https://github.com/docker/docker-init
--->
+{{< summary-bar feature_name="Docker Init" >}}

content/reference/compose-file/networks.md

@@ -105,9 +105,28 @@ networks:
     attachable: true
 ```
 
+### `enable_ipv4`
+
+{{< summary-bar feature_name="Compose enable ipv4" >}}
+
+`enable_ipv4` can be used to disable IPv4 address assignment.
+
+```yml
+  networks:
+    ip6net:
+      enable_ipv4: false
+      enable_ipv6: true
+```
+
 ### `enable_ipv6`
 
-`enable_ipv6` enables IPv6 networking. For an example, see step four of [Create an IPv6 network](/manuals/engine/daemon/ipv6.md).
+`enable_ipv6` enables IPv6 address assignment.
+
+```yml
+  networks:
+    ip6net:
+      enable_ipv6: true
+```
 
 ### `external`
 

content/reference/compose-file/services.md

@@ -1425,12 +1425,46 @@ networks:
 
 `mac_address` sets the Mac address used by the service container when connecting to this particular network.
 
+#### `gw_priority`
+
+{{< summary-bar feature_name="Compose gw priority" >}}
+
+The network with the highest `gw_priority` is selected as the default gateway for the service container.
+If unspecified, the default value is 0.
+
+In the following example, `app_net_2` will be selected as the default gateway.
+
+```yaml
+services:
+  app:
+    image: busybox
+    command: top
+    networks:
+      app_net_1:
+      app_net_2:
+        gw_priority: 1
+      app_net_3:
+networks:
+  app_net_1:
+  app_net_2:
+  app_net_3:
+```
+
 #### `priority`
 
 `priority` indicates in which order Compose connects the service’s containers to its
 networks. If unspecified, the default value is 0.
 
-In the following example, the app service connects to `app_net_1` first as it has the highest priority. It then connects to `app_net_3`, then `app_net_2`, which uses the default priority value of 0.
+If the container runtime accepts a `mac_address` attribute at service level, it is
+applied to the network with the highest `priority`. In other cases, use attribute
+`networks.mac_address`.
+
+`priority` does not affect which network is selected as the default gateway. Use the
+[`gw_priority`](#gw_priority) attribute instead.
+
+`priority` does not control the order in which networks connections are added to
+the container, it cannot be used to determine the device name (`eth0` etc.) in the
+container.
 
 ```yaml
 services:

data/debug-cli/docker_debug.yaml

@@ -1,11 +1,6 @@
 command: docker debug
 short: Get a shell into any container or image. An alternative to debugging with `docker exec`.
 long: |-
-  > **Note**
-  >
-  > Docker Debug requires a [Pro, Team, or Business subcription](/subscription/details/).
-  > You must [sign in](/desktop/get-started/) to use this command.
-
   Docker Debug is a CLI command that helps you follow best practices by keeping your images small and secure. 
   With Docker Debug, you can debug your images while they contain the bare minimum to run your application.
   It does this by letting you create and work with slim images or containers that are often difficult to debug because all tools have been removed. 
@@ -27,7 +22,7 @@ long: |-
   - `entrypoint`: Print, lint, or run the entrypoint, see [example](#understanding-the-default-startup-command-of-a-container-entry-points).
   - `builtins`: Show custom builtin tools.
 
-  > **Note**
+  > [!NOTE]
   >
   > For images and stopped containers, all changes are discarded when leaving the shell. 
   > At no point, do changes affect the actual image or container. 

data/init-cli/docker_init.yaml

@@ -16,12 +16,11 @@ long: |-
     init` can overwrite it, using `docker-compose.yaml` as the name for the
     Compose file.
 
-    > **Warning**
+    > [!WARNING]
     >
     > You can't recover overwritten files.
     > To back up an existing file before selecting to overwrite it, rename the file or copy it to another directory.
-    { .warning }
-
+
   After running `docker init`, you can choose one of the following templates:
 
     * ASP.NET Core: Suitable for an ASP.NET Core application.

data/summary.yaml

@@ -80,12 +80,16 @@ Compose exec:
   requires: Docker Compose [2.32.2](/manuals/compose/releases/release-notes.md#2232) and later
 Compose experimental:
   requires: Docker Compose [2.26.0](/manuals/compose/releases/release-notes.md#2260) and later
+Compose enable ipv4:
+  requires: Docker Compose [2.33.1](/manuals/compose/releases/release-notes.md#2331) and later
 Compose file watch:
   requires: Docker Compose [2.22.0](/manuals/compose/releases/release-notes.md#2220) and later
 Compose format:
   requires: Docker Compose [2.30.0](/manuals/compose/releases/release-notes.md#2300) and later
 Compose gpus:
   requires: Docker Compose [2.30.0](/manuals/compose/releases/release-notes.md#2300) and later
+Compose gw priority:
+  requires: Docker Compose [2.33.1](/manuals/compose/releases/release-notes.md#2331) and later
 Compose include:
   requires: Docker Compose [2.20.3](/manuals/compose/releases/release-notes.md#2203) and later
 Compose label file:
@@ -118,6 +122,9 @@ Docker CLI OpenTelemetry:
   requires: Docker Engine [26.1.0](/manuals/engine/release-notes/26.1.md#2610) and later
 docker compose alpha:
   availability: Experimental
+Docker Debug:
+  subscription: [Pro, Team, Business]
+  requires: Docker Desktop [4.33.0](/manuals/desktop/release-notes.md#4330) and later
 Docker Desktop Archlinux:
   availability: Experimental
 Docker Desktop CLI:
@@ -127,6 +134,8 @@ Docker Desktop CLI update:
   requires: Docker Desktop 4.38 and later
 Docker GitHub Copilot:
   availability: Early Access
+Docker Init:
+  requires: Docker Desktop [4.27](/manuals/desktop/release-notes.md#4270) and later
 Docker Scout exceptions:
   availability: Experimental
   requires: Docker Scout CLI [1.15.0](/manuals/scout/release-notes/cli.md#1150) and later