Merge pull request #22960 from docker/published-update

publish updates from main

Author: aevesdocker

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

@@ -2,6 +2,6 @@
 # github.com/moby/buildkit v0.23.1
 # github.com/docker/buildx v0.25.0
 # github.com/docker/cli v28.3.0+incompatible
-# github.com/docker/compose/v2 v2.37.3
+# github.com/docker/compose/v2 v2.38.1
 # github.com/docker/model-cli v0.1.26-0.20250527144806-15d0078a3c01
 # github.com/docker/scout-cli v1.15.0

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

@@ -36,6 +36,18 @@ services:
 
 This means the team managing `serviceB` can refactor its own database component to introduce additional services without impacting any dependent teams. It also means that the dependent teams don't need to include additional flags on each Compose command they run.
 
+```yaml
+include:
+  - oci://docker.io/username/my-compose-app:latest # use a Compose file stored as an OCI artifact
+services:
+  serviceA:
+    build: .
+    depends_on:
+      - serviceB 
+```
+`include` allows you to reference Compose files from remote sources, such as OCI artifacts or Git repositories.  
+Here `serviceB` is defined in a Compose file stored on Docker Hub.
+
 ## Include and overrides
 
 Compose reports an error if any resource from `include` conflicts with resources from the included Compose file. This rule prevents

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

@@ -13,6 +13,35 @@ aliases:
 
 For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/).
 
+## 2.38.1
+
+{{< release-date date="2025-06-30" >}}
+
+### Bug fixes and enhancements
+
+- Added support of `model_variable` for service `models` configuration
+
+### Update
+
+- Dependencies upgrade: bump compose-go to v2.7.1
+
+## 2.38.0
+
+{{< release-date date="2025-06-30" >}}
+
+### Bug fixes and enhancements
+
+- Introduced support of `models` for LLM configuration
+- Added `volumes` command
+- Removed `publish` limitation on bind mounts
+- Fixed an issue mounting the docker socket to container which doesn't need it
+- Fixed an issue with bake hanging on output 
+
+### Update
+
+- Dependencies upgrade: bump compose-go to v2.7.0
+- Dependencies upgrade: bump docker engine and cli to v28.3.0
+
 ## 2.37.3
 
 {{< release-date date="2025-06-24" >}}

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

@@ -0,0 +1,13 @@
+---
+datafolder: compose-cli
+datafile: docker_compose_volumes
+title: docker compose volumes
+layout: cli
+---
+
+<!--
+Sorry, but the contents of this page are automatically generated from
+Docker's source code. If you want to suggest a change to the text that appears
+here, you'll need to find the string by searching this repo:
+https://github.com/docker/compose
+-->

_vendor/modules.txt

@@ -0,0 +1,65 @@
+---
+title: Models
+description: Learn about the models top-level element
+keywords: compose, compose specification, models, compose file reference
+weight: 120
+---
+
+{{< summary-bar feature_name="Compose models" >}}
+
+The top-level `models` section declares AI models that are used by your Compose application. These models are typically pulled as OCI artifacts, run by a model runner, and exposed as an API that your service containers can consume.
+
+Services can only access models when explicitly granted by a [`models` attribute](services.md#models) within the `services` top-level element.
+
+## Examples
+
+### Example 1
+
+```yaml
+services:
+  app:
+    image: app
+    models:
+      - ai_model
+
+
+models:
+  ai_model:
+    model: ai/model
+```
+
+In this basic example:
+
+ - The app service uses the `ai_model`.
+ - The `ai_model` is defined as an OCI artifact (`ai/model`) that is pulled and served by the model runner.
+ - Docker Compose injects connection info, for example `AI_MODEL_URL`, into the container. 
+
+### Example 2
+
+```yaml
+services:
+  app:
+    image: app
+    models:
+      my_model:
+        endpoint_var: MODEL_URL
+
+models:
+  my_model:
+    model: ai/model
+    context_size: 1024
+    runtime_flags: 
+      - "--a-flag"
+      - "--another-flag=42"
+```
+
+In this advanced setup:
+
+ - The service app references `my_model` using the long syntax.
+ - Compose injects the model runner's URL as the environment variable `MODEL_URL`.
+
+## Attributes
+
+- `model` (required): The OCI artifact identifier for the model. This is what Compose pulls and runs via the model runner. 
+- `context_size`: Defines the maximum token context size for the model.
+- `runtime_flags`: A list of raw command-line flags passed to the inference engine when the model is started.

content/manuals/compose/how-tos/multiple-compose-files/include.md

@@ -1288,6 +1288,41 @@ There is a performance penalty for applications that swap memory to disk often.
 - If `memswap_limit` is unset, and `memory` is set, the container can use as much swap as the `memory` setting, if the host container has swap memory configured. For instance, if `memory`="300m" and `memswap_limit` is not set, the container can use 600m in total of memory and swap.
 - If `memswap_limit` is explicitly set to -1, the container is allowed to use unlimited swap, up to the amount available on the host system.
 
+### models
+
+{{< summary-bar feature_name="Compose models" >}}
+
+`models` defines which AI models the service should use at runtime. Each referenced model must be defined under the [`models` top-level element](models.md).
+
+```yaml
+services:
+  short_syntax:
+    image: app
+    models:
+      - my_model
+  long_syntax:
+    image: app
+    models:
+      my_model:
+        endpoint_var: MODEL_URL
+        model_var: MODEL
+```
+
+When a service is linked to a model, Docker Compose injects environment variables to pass connection details and model identifiers to the container. This allows the application to locate and communicate with the model dynamically at runtime, without hard-coding values.
+
+#### Long syntax
+
+The long syntax gives you more control over the environment variable names.
+
+- `endpoint_var` sets the name of the environment variable that holds the model runner’s URL.
+- `model_var` sets the name of the environment variable that holds the model identifier.
+
+If either is omitted, Compose automatically generates the environment variable names based on the model key using the following rules:
+
+ - Convert the model key to uppercase
+ - Replace any '-' characters with '_'
+ - Append `_URL` for the endpoint variable
+
 ### `network_mode`
 
 `network_mode` sets a service container's network mode.