Merge pull request #20910 from docker/published-update

publish updates from main

.github/workflows/merge.yml

@@ -24,7 +24,7 @@ jobs:
           git fetch origin main:main
           git reset --hard main
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4
+        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79
         with:
           delete-branch: false
           branch: published-update

.prettierrc

@@ -1,3 +1,16 @@
 {
-  "plugins": ["prettier-plugin-tailwindcss"]
+  "plugins": [
+    "prettier-plugin-go-template",
+    "prettier-plugin-tailwindcss"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.html"
+      ],
+      "options": {
+        "parser": "go-template"
+      }
+    }
+  ]
 }

_vendor/modules.txt

@@ -2,5 +2,5 @@
 # github.com/moby/buildkit v0.16.0
 # github.com/docker/buildx v0.17.0
 # github.com/docker/cli v27.2.2-0.20240909090509-65decb573126+incompatible
-# github.com/docker/compose/v2 v2.29.3
+# github.com/docker/compose/v2 v2.29.4
 # github.com/docker/scout-cli v1.13.0

assets/css/global.css

@@ -1,9 +1,15 @@
 /* global styles */
 
 @layer base {
-  [x-cloak] {
+  [x-cloak=""] {
     display: none !important;
   }
+  /* alpine cloak for small screens only */
+  [x-cloak="sm"] {
+    @media (width <= 768px) {
+      display: none !important;
+    }
+  }
 
   :root {
     -webkit-font-smoothing: antialiased;

assets/css/kapa.css

@@ -1,4 +1,6 @@
 .mantine-Modal-root {
+  .mantine-Modal-inner { inset: 0; }
+
   ol {
     list-style-type: decimal;
   }

content/get-started/_index.md

@@ -2,30 +2,32 @@
 title: Get started
 keywords: Docker, get started
 description: Get started with Docker
-notoc: true
-
-get-started:
-- title: Get Docker
-  description: Choose the best installation path for your setup.
-  link: /get-started/get-docker/
+layout: wide
+params:
   icon: download
-- title: What is Docker?
-  description: Learn about the Docker platform.
-  link: /get-started/docker-overview/
-  icon: summarize
-get-started2:
-- title: Introduction
-  description: Get started with the basics and the benefits of containerizing your applications.
-  link: /get-started/introduction/
-  icon: rocket
-- title: Docker concepts
-  description: Gain a better understanding of foundational Docker concepts.
-  link: /get-started/docker-concepts/the-basics/what-is-a-container/
-  icon: foundation
-- title: Docker workshop
-  description: Get guided through a 45-minute workshop to learn about Docker.
-  link: /get-started/workshop/
-  icon: desk
+  notoc: true
+  get-started:
+  - title: Get Docker
+    description: Choose the best installation path for your setup.
+    link: /get-started/get-docker/
+    icon: download
+  - title: What is Docker?
+    description: Learn about the Docker platform.
+    link: /get-started/docker-overview/
+    icon: summarize
+  get-started2:
+  - title: Introduction
+    description: Get started with the basics and the benefits of containerizing your applications.
+    link: /get-started/introduction/
+    icon: rocket
+  - title: Docker concepts
+    description: Gain a better understanding of foundational Docker concepts.
+    link: /get-started/docker-concepts/the-basics/what-is-a-container/
+    icon: foundation
+  - title: Docker workshop
+    description: Get guided through a 45-minute workshop to learn about Docker.
+    link: /get-started/workshop/
+    icon: desk
 ---
 
 If you're new to Docker, this section guides you through the essential resources to get started.

content/get-started/workshop/03_updating_app.md

@@ -10,7 +10,7 @@ aliases:
  - /guides/workshop/03_updating_app/
 ---
 
-In [part 2](./02_our_app.md), you containerized a todo application. In this part, you'll update the application and image. You'll also learn how to stop and remove a container.
+In [part 1](./02_our_app.md), you containerized a todo application. In this part, you'll update the application and image. You'll also learn how to stop and remove a container.
 
 ## Update the source code
 

content/get-started/workshop/06_bind_mounts.md

@@ -10,7 +10,7 @@ aliases:
  - /guides/workshop/06_bind_mounts/
 ---
 
-In [part 5](./05_persisting_data.md), you used a volume mount to persist the
+In [part 4](./05_persisting_data.md), you used a volume mount to persist the
 data in your database. A volume mount is a great choice when you need somewhere
 persistent to store your application data.
 

content/guides/_index.md

@@ -2,31 +2,32 @@
 title: Guides
 keywords: Docker guides
 description: Explore the Docker guides
-notoc: true
-
-dive-deeper:
-- title: Language-specific guides
-  description: Learn how to containerize, develop, and test language-specific apps using Docker.
-  link: /language/
-  icon: code
-- title: Use-case guides
-  description: Walk through practical Docker applications for specific scenarios.
-  link: /guides/use-case/
-  icon: task
-- title: Deployment and Orchestration
-  description: Deploy and manage Docker containers at scale.
-  link: /guides/deployment-orchestration/orchestration/
-  icon: workspaces
-
-resources:
-- title: Educational resources
-  description: Explore diverse Docker training and hands-on experiences.
-  link: /guides/resources/
-  icon: book
-- title: Contribute to Docker's docs
-  description: Learn how to help contribute to Docker docs.
-  link: /contribute/
-  icon: edit
+params:
+  icon: developer_guide
+  notoc: true
+  dive-deeper:
+  - title: Language-specific guides
+    description: Learn how to containerize, develop, and test language-specific apps using Docker.
+    link: /language/
+    icon: code
+  - title: Use-case guides
+    description: Walk through practical Docker applications for specific scenarios.
+    link: /guides/use-case/
+    icon: task
+  - title: Deployment and Orchestration
+    description: Deploy and manage Docker containers at scale.
+    link: /guides/deployment-orchestration/orchestration/
+    icon: workspaces
+  resources:
+  - title: Educational resources
+    description: Explore diverse Docker training and hands-on experiences.
+    link: /guides/resources/
+    icon: book
+  - title: Contribute to Docker's docs
+    description: Learn how to help contribute to Docker docs.
+    link: /contribute/
+    icon: edit
+layout: wide
 ---
 
 This section contains more advanced guides to help you learn how Docker can optimize your development workflows.

content/includes/_index.md

@@ -1,7 +1,7 @@
 ---
 cascade:
 - build:
-    list: local
+    list: never
     publishResources: false
     render: never
 ---

content/learning-paths/_index.md

@@ -1,10 +1,10 @@
 ---
 title: Learning paths
-cascade:
-  layout: wide
 description: |
   Docker Learning Paths offer structured guides to help you master Docker.
 keywords: docker, learning, paths, tutorials, resources
+params:
+  icon: "school"
 ---
 
 <p class="w-2/3">

content/manuals/_index.md

@@ -4,62 +4,65 @@ description: Learn how to install, set up, configure, and use Docker products wi
 keywords: docker, docs, manuals, products, user guides, how-to
 # hard-code the URL of this page
 url: /manuals/
-notoc: true
-development:
-- title: Docker Desktop
-  description: Your command center for container development.
-  icon: /assets/icons/Whale.svg
-  link: /desktop/
-- title: Docker Compose
-  description: Define and run multi-container applications.
-  icon: /assets/icons/Compose.svg
-  link: /compose/
-- title: Docker Build
-  description: Build and ship any application anywhere.
-  icon: build
-  link: /build/
-- title: Docker Engine
-  description: The industry-leading container runtime.
-  icon: developer_board
-  link: /engine/
-- title: Docker Extensions
-  description: Customize your Docker Desktop workflow.
-  icon: extension
-  link: /extensions/
-services:
-- title: Docker Hub
-  description: Discover, share, and integrate container images
-  icon: hub
-  link: /docker-hub/
-- title: Docker Scout
-  description: Image analysis and policy evaluation.
-  icon: /assets/icons/Scout.svg
-  link: /scout/
-- title: Trusted content
-  description: Curated, high-quality content from trusted sources.
-  icon: verified
-  link: /trusted-content/
-- title: Build Cloud
-  description: Build your images faster in the cloud.
-  icon: /assets/images/logo-build-cloud.svg
-  link: /build-cloud/
-admin:
-- title: Administration
-  description: Centralized observability for companies and organizations.
-  icon: admin_panel_settings
-  link: /admin/
-- title: Security
-  description: Security guardrails for both administrators and developers.
-  icon: lock
-  link: /security/
-- title: Billing
-  description: Manage billing and payment methods.
-  icon: payments
-  link: /billing/
-- title: Subscription
-  description: Commercial use licenses for Docker products.
-  icon: card_membership
-  link: /subscription/
+layout: wide
+params:
+  icon: description
+  notoc: true
+  development:
+  - title: Docker Desktop
+    description: Your command center for container development.
+    icon: /assets/icons/Whale.svg
+    link: /desktop/
+  - title: Docker Compose
+    description: Define and run multi-container applications.
+    icon: /assets/icons/Compose.svg
+    link: /compose/
+  - title: Docker Build
+    description: Build and ship any application anywhere.
+    icon: build
+    link: /build/
+  - title: Docker Engine
+    description: The industry-leading container runtime.
+    icon: developer_board
+    link: /engine/
+  - title: Docker Extensions
+    description: Customize your Docker Desktop workflow.
+    icon: extension
+    link: /extensions/
+  services:
+  - title: Docker Hub
+    description: Discover, share, and integrate container images
+    icon: hub
+    link: /docker-hub/
+  - title: Docker Scout
+    description: Image analysis and policy evaluation.
+    icon: /assets/icons/Scout.svg
+    link: /scout/
+  - title: Trusted content
+    description: Curated, high-quality content from trusted sources.
+    icon: verified
+    link: /trusted-content/
+  - title: Build Cloud
+    description: Build your images faster in the cloud.
+    icon: /assets/images/logo-build-cloud.svg
+    link: /build-cloud/
+  admin:
+  - title: Administration
+    description: Centralized observability for companies and organizations.
+    icon: admin_panel_settings
+    link: /admin/
+  - title: Security
+    description: Security guardrails for both administrators and developers.
+    icon: lock
+    link: /security/
+  - title: Billing
+    description: Manage billing and payment methods.
+    icon: payments
+    link: /billing/
+  - title: Subscription
+    description: Commercial use licenses for Docker products.
+    icon: card_membership
+    link: /subscription/
 ---
 
 This section contains user guides on how to install, set up, configure, and use

content/manuals/compose/install/_index.md

@@ -30,6 +30,19 @@ Docker Desktop is available on:
 
 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" >}}.
 
+> [!NOTE] 
+>
+> After Docker Compose V1 was removed in Docker Desktop version [4.23.0](/desktop/release-notes/#4230) as it had reached end-of-life,
+> the `docker-compose` command now points directly to the Docker Compose V2 binary, running in standalone mode. 
+> If you rely on Docker Desktop auto-update, the symlink might be broken and command unavailable, as the update doesn't ask for administrator password. 
+> 
+> This only affects Mac users. To fix this, either recreate the symlink:
+> ```console
+> $ 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.
+
 ### Scenario two: Install the Compose plugin
 
 If you already have Docker Engine and Docker CLI installed, you can install the Compose plugin from the command line, by either:

content/manuals/compose/release-notes.md

@@ -11,6 +11,20 @@ aliases:
 
 For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/).
 
+## 2.29.4
+
+{{< release-date date="2024-09-16" >}}
+
+### Update
+
+- Dependencies upgrade: bump buildx to v0.17.1
+- Dependencies upgrade: bump docker engine and cli to v27.3.0-rc.1
+
+### Bug fixes and enhancements
+
+- Fixed an issue with services not stopping when restarting diverged dependencies. 
+- Fixed potential `nil` pointer error on the OTEL client.
+
 ## 2.29.3
 
 {{< release-date date="2024-09-12" >}}

content/manuals/compose/startup-order.md

@@ -52,6 +52,8 @@ Compose creates services in dependency order. `db` and `redis` are created befor
 
 Compose waits for healthchecks to pass on dependencies marked with `service_healthy`. `db` is expected to be "healthy" (as indicated by `healthcheck`) before `web` is created.
 
+`restart: true` ensures that if `db` is updated or restarted due to an explicit Compose operation, for example `docker compose restart`, the `web` service is also restarted automatically, ensuring it re-establishes connections or dependencies correctly.
+
 The healthcheck for the `db` service uses the `pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}'` command to check if the PostgreSQL database is ready. The service is retried every 10 seconds, up to 5 times.
 
 Compose also removes services in dependency order. `web` is removed before `db` and `redis`.