Merge pull request #22667 from docker/published-update

publish updates from main

Author: sarahsanders-docker

_vale/config/vocabularies/Docker/accept.txt

@@ -15,15 +15,16 @@ Citrix
 CloudFront
 Codefresh
 Codespaces
-CouchDB
 Couchbase
+CouchDB
 Datadog
 Ddosify
 Debootstrap
 Dev
-Dex
 Dev Environments?
+Dex
 Django
+DMR
 Docker Build Cloud
 Docker Business
 Docker Dasboard
@@ -33,8 +34,8 @@ Docker Extension
 Docker Hub
 Docker Scout
 Docker Team
-Docker's
 Docker-Sponsored Open Source
+Docker's
 Dockerfile
 Dockerize
 Dockerizing
@@ -44,54 +45,55 @@ Fargate
 Fedora
 Flink
 GeoNetwork
+GGUF
 Git
 GitHub( Actions)?
 Google
 Grafana
 Gravatar
 HyperKit
-IPv[46]
-IPvlan
 Intel
 Intune
-JFrog
+IPv[46]
+IPvlan
 Jamf
 JetBrains
+JFrog
 JUnit
 Kerberos
 Kitematic
 Kubeadm
 Kubernetes
-Laravel
 Laradock
+Laravel
 Linux
 LinuxKit
 Logstash
 Mac
 Mail(chimp|gun)
 Microsoft
 MySQL
-NFSv\d
 Netplan
+NFSv\d
 Nginx
 Nutanix
 Nuxeo
 OAuth
+Okta
 Ollama
 OTel
-Okta
-PKG
 Paketo
+PKG
 Postgres
 PowerShell
 Python
 Ryuk
 S3
-SQLite
 Slack
 Snyk
 Solr
 SonarQube
+SQLite
 Syft
 Sysbox
 Sysdig

_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md

@@ -2,5 +2,5 @@
 # github.com/moby/buildkit v0.22.0-rc1
 # github.com/docker/buildx v0.23.0
 # github.com/docker/cli v28.1.1+incompatible
-# github.com/docker/compose/v2 v2.36.0
+# github.com/docker/compose/v2 v2.36.1
 # github.com/docker/scout-cli v1.15.0

_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml

@@ -38,22 +38,33 @@ In the following image, you can see an example Docker command from Docker Hub. T
 
 ## Push the image
 
-1. In the command line, run the `docker push` command that you see on Docker
-   Hub. Note that your command will have your Docker ID, not "docker". For example, `docker push YOUR-USER-NAME/getting-started`.
+Let's try to push the image to Docker Hub.
+
+1. In the command line, run the following commmand:
+
+   ```console
+   docker push docker/getting-started
+   ```
+
+   You'll see an error like this:
 
    ```console
    $ docker push docker/getting-started
    The push refers to repository [docker.io/docker/getting-started]
    An image does not exist locally with the tag: docker/getting-started
    ```
 
-    Why did it fail? The push command was looking for an image named `docker/getting-started`, but
-    didn't find one. If you run `docker image ls`, you won't see one either.
+   This failure is expected because the image isn't tagged correctly yet.
+   Docker is looking for an image name `docker/getting started`, but your
+   local image is still named `getting-started`.
 
-    To fix this, you need to tag your existing image you've built to give it another name.
+   You can confirm this by running:
 
-2. Sign in to Docker Hub using the command `docker login -u YOUR-USER-NAME`.
+   ```console
+   docker image ls
+   ```
 
+2. To fix this, first sign in to Docker Hub using your Docker ID: `docker login YOUR-USER-NAME`.
 3. Use the `docker tag` command to give the `getting-started` image a new name. Replace `YOUR-USER-NAME` with your Docker ID.
 
    ```console

_vendor/modules.txt

@@ -41,7 +41,7 @@ COPY . .
 RUN go build -o /app .
 
 # Final lightweight stage
-FROM alpine:3.17 AS final
+FROM alpine:3.21 AS final
 
 # Copy the compiled binary from the builder stage
 COPY --from=builder /app /bin/app
@@ -63,7 +63,7 @@ The Dockerfile consists of two stages:
 
 2. **Final stage**: This stage uses the official Alpine image as the base and copies the compiled binary from the build stage. It also exposes the application's port and runs the application.
 
-    You use the `alpine:3.17` image as the base image for the final stage. You copy the compiled binary from the build stage to the final image. You expose the application's port using the `EXPOSE` instruction and run the application using the `CMD` instruction.
+    You use the `alpine:3.21` image as the base image for the final stage. You copy the compiled binary from the build stage to the final image. You expose the application's port using the `EXPOSE` instruction and run the application using the `CMD` instruction.
 
     Apart from the multi-stage build, the Dockerfile also follows best practices such as using the official images, setting the working directory, and copying only the necessary files to the final image. You can further optimize the Dockerfile by other best practices.
 

content/get-started/workshop/04_sharing_app.md

@@ -1,5 +1,10 @@
 > [!IMPORTANT]
 >
-> Starting July 1, 2024, Docker will begin collecting sales tax on subscription fees in compliance with state regulations for customers in the United States. For our global customers subject to VAT, the implementation will start rolling out on July 1, 2024. Note that while the roll out begins on this date, VAT charges may not apply to all applicable subscriptions immediately.
+> For United States customers, Docker began collecting sales tax on July 1, 2024.
+> For European customers, Docker began collecting VAT on March 1, 2025.
+> For United Kingdom customers, Docker began collecting VAT on May 1, 2025.
 >
-> To ensure that tax assessments are correct, make sure that your [billing information](/billing/details/) and VAT/Tax ID, if applicable, are updated. If you're exempt from sales tax, see [Register a tax certificate](/billing/tax-certificate/).
+> To ensure that tax assessments are correct, make sure that your
+[billing information](/billing/details/) and VAT/Tax ID, if applicable, are
+updated. If you're exempt from sales tax, see
+[Register a tax certificate](/billing/tax-certificate/).

content/guides/go-prometheus-monitoring/containerize.md

@@ -33,13 +33,17 @@ params:
     link: /testcontainers/
   ai:
   - title: Ask Gordon
-    description: streamline your workflow and get the most out of the Docker ecosystem with your personal AI assistant.
+    description: Streamline your workflow and get the most out of the Docker ecosystem with your personal AI assistant.
     icon: note_add
     link: /ai/gordon/
   - title: Docker Model Runner
-    description: View and manage your local models
+    description: View and manage your local models.
     icon: view_in_ar
     link: /model-runner/
+  - title: MCP Catalog and Toolkit
+    description: Augment your AI workflow with MCP servers.
+    icon: /assets/icons/toolbox.svg
+    link: /ai/mcp-catalog-and-toolkit/
   products:
   - title: Docker Desktop
     description: Your command center for container development.

content/includes/tax-compliance.md

@@ -7,11 +7,12 @@ keywords: organization, settings, Admin Console
 
 This section describes how to manage organization settings in the Docker Admin Console.
 
-## Configure general information
+## Configure organization information
 
 General organization information appears on your organization landing page in the Admin Console.
 
 This information includes:
+
  - Organization Name
  - Company
  - Location
@@ -22,7 +23,7 @@ To edit this information:
 
 1. Sign in to the [Admin Console](https://admin.docker.com).
 2. Select your company on the **Choose profile** page.
-3. Under **Organization settings**, select **General**.
+3. Under **Organization settings**, select **Organization information**.
 4. Specify the organization information and select **Save**.
 
 ## Next steps

content/manuals/_index.md

@@ -110,7 +110,7 @@ configure your organization.
 
 - **Security and access**: Manage security settings. For more information, see [Security](/manuals/security/_index.md).
 
-- **Organization settings**: Update general settings, manage your company settings, or [deactivate your organization](/manuals/admin/organization/deactivate-account.md).
+- **Organization settings**: Update organization information or [deactivate your organization](/manuals/admin/organization/deactivate-account.md).
 
 {{< /tab >}}
 {{< tab name="Docker Hub" >}}