Skip to content

Commit d6cdb23

Browse files
github-actions[bot]ArthurFlagDaniel-Kolevaevesdockerglours
authored
publish updates from main (#22993)
Automated pull request for publishing docs updates. --------- Signed-off-by: Guillaume Lours <[email protected]> Co-authored-by: Arthur <[email protected]> Co-authored-by: Daniel Kolev <[email protected]> Co-authored-by: Allie Sadler <[email protected]> Co-authored-by: Guillaume Lours <[email protected]>
1 parent ce2a5d6 commit d6cdb23

File tree

6 files changed

+17
-64
lines changed

6 files changed

+17
-64
lines changed

content/includes/gordondhi.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

content/manuals/ai/compose/model-runner.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040

4141
models:
4242
smollm2:
43-
image: ai/smollm2
43+
model: ai/smollm2
4444
```
4545
4646
### How it works
@@ -70,7 +70,7 @@ services:
7070
7171
models:
7272
smollm2:
73-
image: ai/smollm2
73+
model: ai/smollm2
7474
```
7575

7676
With this configuration, your `my-chat-app` service will receive:

content/manuals/ai/compose/models-and-compose.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ services:
4242

4343
models:
4444
llm:
45-
image: ai/smollm2
45+
model: ai/smollm2
4646
```
4747
4848
This example defines:
@@ -56,7 +56,7 @@ Models support various configuration options:
5656
```yaml
5757
models:
5858
llm:
59-
image: ai/smollm2
59+
model: ai/smollm2
6060
context_size: 1024
6161
runtime_flags:
6262
- "--a-flag"
@@ -87,9 +87,9 @@ services:
8787
8888
models:
8989
llm:
90-
image: ai/smollm2
90+
model: ai/smollm2
9191
embedding-model:
92-
image: ai/all-minilm
92+
model: ai/all-minilm
9393
```
9494

9595
With short syntax, the platform automatically generates environment variables based on the model name:
@@ -116,9 +116,9 @@ services:
116116
117117
models:
118118
llm:
119-
image: ai/smollm2
119+
model: ai/smollm2
120120
embedding-model:
121-
image: ai/all-minilm
121+
model: ai/all-minilm
122122
```
123123

124124
With this configuration, your service receives:
@@ -142,7 +142,7 @@ services:
142142
143143
models:
144144
llm:
145-
image: ai/smollm2
145+
model: ai/smollm2
146146
```
147147

148148
Docker Model Runner will:
@@ -163,9 +163,9 @@ services:
163163
164164
models:
165165
llm:
166-
image: ai/smollm2
166+
model: ai/smollm2
167167
# Cloud-specific configurations
168-
labels:
168+
x-cloud-options:
169169
- "cloud.instance-type=gpu-small"
170170
- "cloud.region=us-west-2"
171171
```

content/manuals/ai/gordon/_index.md

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ of the Docker ecosystem.
2020

2121
## Key features
2222

23-
Ask Gordon provides AI-powered assistance in Docker tools. It can:
23+
Ask Gordon provides AI-powered assistance within Docker tools. It can:
2424

2525
- Improve Dockerfiles
2626
- Run and troubleshoot containers
2727
- Interact with your images and code
2828
- Find vulnerabilities or configuration issues
29-
- Migrate a Dockerfile to use [Docker Hardened Images](/manuals/dhi/_index.md)
3029

3130
It understands your local environment, including source code, Dockerfiles, and
3231
images, to provide personalized and actionable guidance.
@@ -105,10 +104,9 @@ If you have concerns about data collection or usage, you can
105104
106105
## Using Ask Gordon
107106

108-
You can access Gordon:
109-
110-
- In Docker Desktop, in the **Ask Gordon** view.
111-
- Via the Docker CLI, with the `docker ai` CLI command.
107+
The primary interfaces to Docker's AI capabilities are through the **Ask
108+
Gordon** view in Docker Desktop, or if you prefer to use the CLI: the `docker
109+
ai` CLI command.
112110

113111
Once you've enabled the Docker AI features, you'll also find references to **Ask
114112
Gordon** in various other places throughout the Docker Desktop user interface.
@@ -124,7 +122,6 @@ ways things you can try:
124122
- [Troubleshoot a crashed container](#troubleshoot-a-crashed-container)
125123
- [Get help with running a container](#get-help-with-running-a-container)
126124
- [Improve a Dockerfile](#improve-a-dockerfile)
127-
- [Migrate a Dockerfile to DHI](#migrate-a-dockerfile-to-dhi)
128125

129126
For more examples, try asking Gordon directly. For example:
130127

@@ -200,17 +197,6 @@ across several dimensions:
200197
- Portability
201198
- Resource efficiency
202199

203-
### Migrate a Dockerfile to DHI
204-
205-
Migrating your Dockerfile to use [Docker Hardened Images](/manuals/dhi/_index.md) helps you build
206-
more secure, minimal, and production-ready containers. DHIs are designed to
207-
reduce vulnerabilities, enforce best practices, and simplify compliance, making
208-
them a strong foundation for secure software supply chains.
209-
210-
To request Gordon's help for the migration:
211-
212-
{{% include "gordondhi.md" %}}
213-
214200
## Disable Ask Gordon
215201

216202
### For individual users

content/manuals/dhi/features/integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ and CI to scanning and deployment. They:
7878
- Include security metadata that plugs into your existing compliance systems
7979

8080
This means you can adopt stronger security controls without disrupting your
81-
engineering workflows.
81+
engineering workflows.

content/manuals/dhi/how-to/migrate.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ keywords: migrate dockerfile, hardened base image, multi-stage build, non-root c
99
{{< summary-bar feature_name="Docker Hardened Images" >}}
1010

1111
This guide helps you migrate your existing Dockerfiles to use Docker Hardened
12-
Images (DHIs) [manually](#step-1-update-the-base-image-in-your-dockerfile),
13-
or with [Gordon](#use-gordon).
14-
DHIs are minimal and security-focused, which may require
12+
Images (DHIs). DHIs are minimal and security-focused, which may require
1513
adjustments to your base images, build process, and runtime configuration.
1614

1715
This guide focuses on migrating framework images, such as images for building
@@ -242,10 +240,3 @@ ENTRYPOINT [ "python", "/app/image.py" ]
242240

243241
{{< /tab >}}
244242
{{< /tabs >}}
245-
246-
### Use Gordon
247-
248-
Alternatively, you can request assistance to
249-
[Gordon](/manuals/ai/gordon/_index.md), Docker's AI-powered assistant, to migrate your Dockerfile:
250-
251-
{{% include "gordondhi.md" %}}

0 commit comments

Comments
 (0)