Merge branch 'main' into patch-2

Author: aevesdocker

_vale/Docker/Acronyms.yml

@@ -5,25 +5,30 @@ level: warning
 ignorecase: false
 # Ensures that the existence of 'first' implies the existence of 'second'.
 first: '\b([A-Z]{2,5})\b'
-second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})\)'
+second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})s?\)'
 # ... with the exception of these:
 exceptions:
   - AGPL
+  - AI
   - API
   - ARM
   - ASP
   - AUFS
   - AWS
   - BIOS
   - BPF
+  - BSD
+  - CFS
   - CI
+  - CIDR
   - CISA
   - CLI
   - CNCF
   - CORS
   - CPU
   - CSS
   - CSV
+  - CUDA
   - CVE
   - DCT
   - DEBUG
@@ -54,9 +59,12 @@ exceptions:
   - HTTP
   - HTTPS
   - IAM
+  - IBM
   - ID
   - IDE
   - IP
+  - IPAM
+  - IPC
   - JAR
   - JSON
   - JSX
@@ -70,10 +78,13 @@ exceptions:
   - NET
   - NFS
   - NOTE
+  - NTFS
   - NTLM
+  - NUMA
   - NVDA
   - OCI
   - OS
+  - OSI
   - OSS
   - PATH
   - PDF
@@ -86,6 +97,7 @@ exceptions:
   - RAM
   - REPL
   - REST
+  - RFC
   - RHEL
   - RPM
   - RSA
@@ -120,8 +132,10 @@ exceptions:
   - USB
   - USD
   - UTF
+  - UTS
   - UUID
   - VAT
+  - VIP
   - VLAN
   - VM
   - VPN

_vale/config/vocabularies/Docker/accept.txt

@@ -1,4 +1,4 @@
-(?-i)[A-Z]{2,}'?s
+(?i)[A-Z]{2,}'?s
 Amazon
 Anchore
 Apple
@@ -20,8 +20,8 @@ Couchbase
 Datadog
 Ddosify
 Debootstrap
-Dev Environments?
 Dev
+Dev Environments?
 Django
 Docker Build Cloud
 Docker Business
@@ -73,8 +73,8 @@ Nuxeo
 OAuth
 OTel
 Okta
-Paketo
 PKG
+Paketo
 Postgres
 PowerShell
 Python
@@ -97,20 +97,27 @@ Windows
 WireMock
 Zscaler
 Zsh
+[Aa]nonymized?
 [Aa]utobuild
-[Bb]uildx
+[Aa]llowlist
 [Bb]uildpack(s)?
+[Bb]uildx
 [Cc]odenames?
 [Cc]ompose
+[Cc]onfigs
 [Dd]istroless
 [Ff]ilepaths?
 [Ff]iletypes?
 [GgCc]oroutine
+[Hh]ealthcheck
 [Hh]ostname
 [Ii]nfosec
+[Ii]nline
 [Kk]eyrings?
 [Ll]oopback
+[Mm]emcached
 [Mm]oby
+[Mm]ountpoint
 [Nn]amespace
 [Oo]nboarding
 [Pp]aravirtualization
@@ -123,6 +130,7 @@ Zsh
 [Ss]andbox(ed)?
 [Ss]eccomp
 [Ss]ubmounts?
+[Ss]ubnet
 [Ss]ubpaths?
 [Ss]ubtrees?
 [Ss]wappable
@@ -133,12 +141,17 @@ Zsh
 [Ss]ysfs
 [Tt]oolchains?
 [Uu]narchived?
+[Uu]ngated
+[Uu]ntrusted
+[Uu]serland
+[Uu]serspace
 [Vv]irtiofs
 [Vv]irtualize
 [Ww]alkthrough
 cgroup
 config
 containerd
+datacenter
 deprovisioning
 deserialization
 deserialize
@@ -166,18 +179,19 @@ npm
 osquery
 osxfs
 pgAdmin
+rollback
 rootful
 runc
 snapshotters?
 stdin
 stdout
-subnet
+syntaxes
+sysctls
 systemd
 tmpfs
 ufw
+uid
 umask
-ungated
-userland
-untrusted
 vSphere
 vpnkit
+windowsfilter

_vendor/modules.txt

@@ -2,5 +2,5 @@
 # github.com/moby/buildkit v0.18.0
 # github.com/docker/buildx v0.19.2
 # github.com/docker/cli v27.4.0+incompatible
-# github.com/docker/compose/v2 v2.31.0
+# github.com/docker/compose/v2 v2.32.0
 # github.com/docker/scout-cli v1.15.0

content/_index.md

@@ -80,17 +80,6 @@ grid:
         url: "/scout/quickstart/"
       - text: "Image analysis"
         url: "/scout/image-analysis/"
-  - title: Trusted content
-    icon: verified
-    description: |
-      High-quality, secure images from Docker and verified partners.
-    links:
-      - text: "Overview"
-        url: "/trusted-content/"
-      - text: "Official images"
-        url: "/trusted-content/official-images/"
-      - text: "Verified publisher program"
-        url: "/trusted-content/dvp-program/"
   - title: Subscription
     icon: card_membership
     description: |

content/get-started/docker-concepts/building-images/multi-stage-builds.md

@@ -231,7 +231,7 @@ Now that you have the project, you’re ready to create the `Dockerfile`.
 1. Now that you have an image built, it's time to run the container.
 
     ```console
-    $ docker run -d -p 8080:8080 spring-helloworld
+    $ docker run -p 8080:8080 spring-helloworld
     ```
 
     You'll then see output similar to the following in the container log:

content/get-started/docker-concepts/the-basics/what-is-an-image.md

@@ -188,10 +188,7 @@ In this walkthrough, you searched and pulled a Docker image. In addition to pull
 
 The following resources will help you learn more about exploring, finding, and building images:
 
-- [Docker Trusted Content](/manuals/trusted-content/_index.md)
-  - [Docker Official Images docs](/manuals/trusted-content/official-images/_index.md)
-  - [Docker Verified Publisher docs](/manuals/trusted-content/dvp-program.md)
-  - [Docker-Sponsored Open Source Program docs](/manuals/trusted-content/dsos-program.md)
+- [Docker trusted content](/manuals/docker-hub/image-library/trusted-content.md)
 - [Explore the Image view in Docker Desktop](/manuals/desktop/use-desktop/images.md)
 - [Docker Build overview](/manuals/build/concepts/overview.md)
 - [Docker Hub](https://hub.docker.com)

content/get-started/introduction/build-and-push-first-image.md

@@ -33,7 +33,7 @@ If you’re new to container images, think of them as a standardized package tha
 
 To share your Docker images, you need a place to store them. This is where registries come in. While there are many registries, Docker Hub is the default and go-to registry for images. Docker Hub provides both a place for you to store your own images and to find images from others to either run or use as the bases for your own images.
 
-In [Develop with containers](develop-with-containers.md), you used the following images that came from Docker Hub, each of which are [Docker Official Images](/trusted-content/official-images/):
+In [Develop with containers](develop-with-containers.md), you used the following images that came from Docker Hub, each of which are [Docker Official Images](/manuals/docker-hub/image-library/trusted-content.md#docker-official-images):
 
 - [node](https://hub.docker.com/_/node) - provides a Node environment and is used as the base of your development efforts. This image is also used as the base for the final application image.
 - [mysql](https://hub.docker.com/_/mysql) - provides a MySQL database to store the to-do list items

content/get-started/workshop/02_our_app.md

@@ -104,7 +104,7 @@ Now that you have an image, you can run the application in a container using the
 
    The `-d` flag (short for `--detach`) runs the container in the background.
    This means that Docker starts your container and returns you to the terminal
-   prompt.
+   prompt. Also, it does not display logs in the terminal.
 
    The `-p` flag (short for `--publish`) creates a port mapping between the
    host and the container. The `-p` flag takes a string value in the format of

content/guides/_index.md

@@ -6,8 +6,9 @@ params:
   icon: developer_guide
 layout: landing
 aliases:
-  - /learning-paths/
+  - /guides/language/
   - /language/
+  - /learning-paths/
 ---
 
 Explore our collection of guides to learn how Docker can optimize your

content/guides/container-supported-development.md

@@ -51,6 +51,10 @@ With container-supported development, it's easy to run databases locally. In thi
 
 {{< youtube-embed VieWeXOwKLU >}}
 
+> [!TIP]
+>
+> Learn more about running databases in containers in the [Use containerized databases](/guides/databases.md) guide.
+
 ### Demo: mocking API endpoints
 
 Many APIs require data from other data endpoints. In development, this adds complexities such as the sharing of credentials, uptime/availability, and rate limiting. Instead of relying on those services directly, your application can interact with a mock API server.
@@ -59,6 +63,10 @@ This demo will demonstrate how using WireMock can make it easy to develop and te
 
 {{< youtube-embed VXSmX6f8vo0 >}}
 
+> [!TIP]
+>
+> Learn more about using WireMock to mock API in the [Mocking API services with WireMock](/guides/wiremock.md) guide.
+
 ### Demo: developing the cloud locally
 
 When developing apps, it's often easier to outsource aspects of the application to cloud services, such as Amazon S3. However, connecting to those services in local development introduces IAM policies, networking constraints, and provisioning complications. While these requirements are important in a production setting, they complicate development environments significantly. 
@@ -67,6 +75,10 @@ With container-supported development, you can run local instances of these servi
 
 {{< youtube-embed JtwUMvR5xlY >}}
 
+> [!TIP]
+>
+> Learn more about using LocalStack in the [Develop and test AWS Cloud applications using LocalStack](/guides/localstack.md) guide.
+
 ### Demo: adding additional debug and troubleshooting tools
 
 Once you start using containers in your development environment, it becomes much easier to add additional containers to visualize the contents of the databases or message queues, seed document stores, or event publishers. In this demo, you'll see a few of these examples, as well as how you can connect multiple containers together to make testing even easier.