Skip to content

Commit 9080d12

Browse files
aevesdockerk-kbkcarlos-quintero
authored
publish updates from main (#22421)
Automated pull request for publishing docs updates. --------- Co-authored-by: Bokyeom <[email protected]> Co-authored-by: Carlos Quintero <[email protected]> Co-authored-by: Allie Sadler <[email protected]>
2 parents cd82ef9 + 013c3ab commit 9080d12

File tree

5 files changed

+27
-26
lines changed

5 files changed

+27
-26
lines changed

content/manuals/compose/how-tos/profiles.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ services:
111111
# Only start backend and db
112112
$ docker compose up -d
113113
114-
# This runs db-migrations (and,if necessary, start db)
115-
# by implicitly enabling the profiles `tools`
114+
# This runs db-migrations (and, if necessary, start db)
115+
# by implicitly enabling the profiles "tools"
116116
$ docker compose run db-migrations
117117
```
118118

@@ -150,7 +150,7 @@ services:
150150
$ docker compose up -d
151151
152152
# Start mock-backend (and, if necessary, db)
153-
# by implicitly enabling profiles `dev`
153+
# by implicitly enabling profiles "dev"
154154
$ docker compose up -d mock-backend
155155
156156
# This fails because profiles "dev" is not enabled

content/manuals/compose/how-tos/startup-order.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Compose waits for healthchecks to pass on dependencies marked with `service_heal
5555

5656
`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.
5757

58-
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.
58+
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.
5959

6060
Compose also removes services in dependency order. `web` is removed before `db` and `redis`.
6161

content/manuals/engine/storage/volumes.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ store data in the cloud, without changing the application logic.
526526

527527
When you create a volume using `docker volume create`, or when you start a
528528
container which uses a not-yet-created volume, you can specify a volume driver.
529-
The following examples use the `vieux/sshfs` volume driver, first when creating
529+
The following examples use the `rclone/docker-volume-rclone` volume driver, first when creating
530530
a standalone volume, and then when starting a container which creates a new
531531
volume.
532532

@@ -555,27 +555,29 @@ host and can connect to the second node using SSH.
555555
On the Docker host, install the `vieux/sshfs` plugin:
556556

557557
```console
558-
$ docker plugin install --grant-all-permissions vieux/sshfs
558+
$ docker plugin install --grant-all-permissions rclone/docker-volume-rclone --aliases rclone
559559
```
560560

561561
### Create a volume using a volume driver
562562

563-
This example specifies an SSH password, but if the two hosts have shared keys
564-
configured, you can exclude the password. Each volume driver may have zero or more
563+
This example mounts the `/remote` directory on host `1.2.3.4` into a
564+
volume named `rclonevolume`. Each volume driver may have zero or more
565565
configurable options, you specify each of them using an `-o` flag.
566566

567567
```console
568-
$ docker volume create --driver vieux/sshfs \
569-
-o sshcmd=test@node2:/home/test \
570-
-o password=testpassword \
571-
sshvolume
568+
$ docker volume create \
569+
-d rclone \
570+
--name rclonevolume \
571+
-o type=sftp \
572+
-o path=remote \
573+
-o sftp-host=1.2.3.4 \
574+
-o sftp-user=user \
575+
-o "sftp-password=$(cat file_containing_password_for_remote_host)"
572576
```
573577

574-
### Start a container which creates a volume using a volume driver
578+
This volume can now be mounted into containers.
575579

576-
The following example specifies an SSH password. However, if the two hosts have
577-
shared keys configured, you can exclude the password.
578-
Each volume driver may have zero or more configurable options.
580+
### Start a container which creates a volume using a volume driver
579581

580582
> [!NOTE]
581583
>
@@ -584,8 +586,8 @@ Each volume driver may have zero or more configurable options.
584586

585587
```console
586588
$ docker run -d \
587-
--name sshfs-container \
588-
--mount type=volume,volume-driver=vieux/sshfs,src=sshvolume,target=/app,volume-opt=sshcmd=test@node2:/home/test,volume-opt=password=testpassword \
589+
--name rclone-container \
590+
--mount type=volume,volume-driver=rclone,src=rclonevolume,target=/app,volume-opt=type=sftp,volume-opt=path=remote, volume-opt=sftp-host=1.2.3.4,volume-opt=sftp-user=user,volume-opt=-o "sftp-password=$(cat file_containing_password_for_remote_host)" \
589591
nginx:latest
590592
```
591593

content/manuals/security/for-admins/hardened-desktop/registry-access-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Docker Admin Console.
2020

2121
Registry Access Management supports both cloud and on-prem registries. This
2222
feature operates at the DNS level and therefore is compatible with all
23-
egistries. You can add any hostname or domain name you’d like to include in the
23+
registries. You can add any hostname or domain name you’d like to include in the
2424
list of allowed registries. However, if the registry redirects to other domains
2525
such as `s3.amazon.com`, then you must add those domains to the list.
2626

layouts/index.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,20 @@ <h2 class="font-medium">Gen AI catalog {{ partial
162162
<div class="flex flex-col gap-12">
163163
<div class="flex flex-col gap-4">
164164
<h2 class="font-medium">
165-
Ask Gordon
165+
Docker Model Runner
166166
{{ partial "components/badge.html" (dict "color" "blue" "content" "Beta") }}
167167
</h2>
168168
<p class="text-xl">
169-
Your personal Docker expert, built right into Docker Desktop.
169+
Run, test, and serve AI models locally in seconds — no setup, no hassle.
170170
</p>
171171
<p>
172-
Boost your productivity with Ask Gordon, an AI-powered
173-
assistant designed to optimize your Docker workflows. From
174-
improving Dockerfiles to troubleshooting containers, Gordon
175-
is here to help.
172+
Whether you’re experimenting with the latest LLMs or deploying to production,
173+
Docker Model Runner brings the performance and control you need, without the friction.
174+
176175
</p>
177176
</div>
178177
<div class="flex flex-col xl:flex-row gap-4 items-start">
179-
<a href="/desktop/features/gordon/"
178+
<a href="/desktop/features/model-runner/"
180179
class="max-w-fit cursor-pointer rounded bg-blue-light px-4 py-2 text-white transition duration-300 hover:bg-blue-light-400 dark:bg-blue-dark-400 dark:hover:bg-blue-dark">Read the docs</a>
181180
</div>
182181
</div>

0 commit comments

Comments
 (0)