From 2c4fffec57f4e4c7f29f23680865e55247bddbee Mon Sep 17 00:00:00 2001 From: Bokyeom <79684339+k-kbk@users.noreply.github.com> Date: Mon, 14 Apr 2025 16:09:26 +0900 Subject: [PATCH 1/4] Fix minor typos (#22419) ## Description Fixed minor typos to improve readability. --- content/manuals/compose/how-tos/profiles.md | 6 +++--- content/manuals/compose/how-tos/startup-order.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/manuals/compose/how-tos/profiles.md b/content/manuals/compose/how-tos/profiles.md index 9f745510b94b..5d90153606b1 100644 --- a/content/manuals/compose/how-tos/profiles.md +++ b/content/manuals/compose/how-tos/profiles.md @@ -111,8 +111,8 @@ services: # Only start backend and db $ docker compose up -d -# This runs db-migrations (and,if necessary, start db) -# by implicitly enabling the profiles `tools` +# This runs db-migrations (and, if necessary, start db) +# by implicitly enabling the profiles "tools" $ docker compose run db-migrations ``` @@ -150,7 +150,7 @@ services: $ docker compose up -d # Start mock-backend (and, if necessary, db) -# by implicitly enabling profiles `dev` +# by implicitly enabling profiles "dev" $ docker compose up -d mock-backend # This fails because profiles "dev" is not enabled diff --git a/content/manuals/compose/how-tos/startup-order.md b/content/manuals/compose/how-tos/startup-order.md index e76deb436692..2234fff15690 100644 --- a/content/manuals/compose/how-tos/startup-order.md +++ b/content/manuals/compose/how-tos/startup-order.md @@ -55,7 +55,7 @@ Compose waits for healthchecks to pass on dependencies marked with `service_heal `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. -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. +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. Compose also removes services in dependency order. `web` is removed before `db` and `redis`. From 00297fd8e3a6a88cc8a238c60cd05b820851b8d1 Mon Sep 17 00:00:00 2001 From: Carlos Quintero Date: Mon, 14 Apr 2025 09:10:00 +0200 Subject: [PATCH 2/4] Fix typo (#22417) Fix small typo --- .../for-admins/hardened-desktop/registry-access-management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md b/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md index 0ee60ecd0bad..cf3892b1a54f 100644 --- a/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md +++ b/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md @@ -20,7 +20,7 @@ Docker Admin Console. Registry Access Management supports both cloud and on-prem registries. This feature operates at the DNS level and therefore is compatible with all -egistries. You can add any hostname or domain name you’d like to include in the +registries. You can add any hostname or domain name you’d like to include in the list of allowed registries. However, if the registry redirects to other domains such as `s3.amazon.com`, then you must add those domains to the list. From d111b09ddbe4b39d7e65df77083b4b836bcf1d9e Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 14 Apr 2025 11:08:13 +0100 Subject: [PATCH 3/4] dmr banner (#22422) ## Description ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- layouts/index.html | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/layouts/index.html b/layouts/index.html index f72b1faae556..c157c1943bee 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -162,21 +162,20 @@

Gen AI catalog {{ partial

- Ask Gordon + Docker Model Runner {{ partial "components/badge.html" (dict "color" "blue" "content" "Beta") }}

- Your personal Docker expert, built right into Docker Desktop. + Run, test, and serve AI models locally in seconds — no setup, no hassle.

- Boost your productivity with Ask Gordon, an AI-powered - assistant designed to optimize your Docker workflows. From - improving Dockerfiles to troubleshooting containers, Gordon - is here to help. + Whether you’re experimenting with the latest LLMs or deploying to production, + Docker Model Runner brings the performance and control you need, without the friction. +

- Read the docs
From 013c3abd81d5eec250c36b771b79cab5c80e391b Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 14 Apr 2025 11:09:33 +0100 Subject: [PATCH 4/4] Oss 5 (#22383) ## Description https://docker.atlassian.net/browse/OSS-5 ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/engine/storage/volumes.md | 30 ++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/content/manuals/engine/storage/volumes.md b/content/manuals/engine/storage/volumes.md index 5fbe2748f0ef..0aa9c3fe708f 100644 --- a/content/manuals/engine/storage/volumes.md +++ b/content/manuals/engine/storage/volumes.md @@ -526,7 +526,7 @@ store data in the cloud, without changing the application logic. When you create a volume using `docker volume create`, or when you start a container which uses a not-yet-created volume, you can specify a volume driver. -The following examples use the `vieux/sshfs` volume driver, first when creating +The following examples use the `rclone/docker-volume-rclone` volume driver, first when creating a standalone volume, and then when starting a container which creates a new volume. @@ -555,27 +555,29 @@ host and can connect to the second node using SSH. On the Docker host, install the `vieux/sshfs` plugin: ```console -$ docker plugin install --grant-all-permissions vieux/sshfs +$ docker plugin install --grant-all-permissions rclone/docker-volume-rclone --aliases rclone ``` ### Create a volume using a volume driver -This example specifies an SSH password, but if the two hosts have shared keys -configured, you can exclude the password. Each volume driver may have zero or more +This example mounts the `/remote` directory on host `1.2.3.4` into a +volume named `rclonevolume`. Each volume driver may have zero or more configurable options, you specify each of them using an `-o` flag. ```console -$ docker volume create --driver vieux/sshfs \ - -o sshcmd=test@node2:/home/test \ - -o password=testpassword \ - sshvolume +$ docker volume create \ + -d rclone \ + --name rclonevolume \ + -o type=sftp \ + -o path=remote \ + -o sftp-host=1.2.3.4 \ + -o sftp-user=user \ + -o "sftp-password=$(cat file_containing_password_for_remote_host)" ``` -### Start a container which creates a volume using a volume driver +This volume can now be mounted into containers. -The following example specifies an SSH password. However, if the two hosts have -shared keys configured, you can exclude the password. -Each volume driver may have zero or more configurable options. +### Start a container which creates a volume using a volume driver > [!NOTE] > @@ -584,8 +586,8 @@ Each volume driver may have zero or more configurable options. ```console $ docker run -d \ - --name sshfs-container \ - --mount type=volume,volume-driver=vieux/sshfs,src=sshvolume,target=/app,volume-opt=sshcmd=test@node2:/home/test,volume-opt=password=testpassword \ + --name rclone-container \ + --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)" \ nginx:latest ```