Skip to content

Commit 1f442fb

Browse files
committed
more freshness
1 parent fd0f4d6 commit 1f442fb

File tree

10 files changed

+59
-108
lines changed

10 files changed

+59
-108
lines changed

content/manuals/desktop/features/containerd.md

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,38 @@
11
---
22
title: containerd image store
3-
weight: 60
3+
weight: 80
44
description: How to activate the containerd integration feature in Docker Desktop
55
keywords: Docker, containerd, engine, image store, lazy-pull
66
toc_max: 3
77
aliases:
88
- /desktop/containerd/
99
---
1010

11-
This page provides information about the ongoing integration of `containerd` for
12-
image and file system management in the Docker Engine.
11+
Docker Desktop is transitioning to use containerd for image and filesystem management. This page outlines the benefits, setup process, and new capabilities enabled by the containerd image store.
1312

1413
> [!NOTE]
1514
>
16-
> Images and containers are not shared between the classic image store and the
17-
> new containerd image store. When you switch image stores, containers and
18-
> images from the inactive store remain but are hidden until you switch back.
15+
> Docker Desktop maintains separate image stores for the classic and containerd image stores.
16+
> When switching between them, images and containers from the inactive store remain on disk but are hidden until you switch back.
1917
20-
## What is containerd?
18+
## What is `containerd`?
2119

22-
`containerd` is an abstraction of the low-level kernel features
23-
used to run and manage containers on a system.
24-
It's a platform used in container software like Docker and Kubernetes.
20+
`containerd` is a container runtime that provides a lightweight, consistent interface for container lifecycle management. It is already used under the hood by Docker Engine for creating, starting, and stopping containers.
2521

26-
Docker Engine already uses `containerd` for container lifecycle management,
27-
which includes creating, starting, and stopping containers.
28-
This page describes the next step of the containerd integration for Docker:
29-
the containerd image store.
22+
Docker Desktop’s ongoing integration of containerd now extends to the image store, offering more flexibility and modern image support.
3023

31-
## Image store
24+
## What is the `containerd` image store?
3225

3326
The image store is the component responsible for pushing, pulling,
3427
and storing images on the filesystem.
28+
3529
The classic Docker image store is limited in the types of images that it supports.
3630
For example, it doesn't support image indices, containing manifest lists.
3731
When you create multi-platform images, for example,
3832
the image index resolves all the platform-specific variants of the image.
3933
An image index is also required when building images with attestations.
4034

41-
The containerd image store extends range of image types
35+
The containerd image store extends the range of image types
4236
that the Docker Engine can natively interact with.
4337
While this is a low-level architectural change,
4438
it's a prerequisite for unlocking a range of new use cases, including:
@@ -88,8 +82,4 @@ and load them to your local image store:
8882

8983
<script async id="asciicast-ZSUI4Mi2foChLjbevl2dxt5GD" src="https://asciinema.org/a/ZSUI4Mi2foChLjbevl2dxt5GD.js"></script>
9084

91-
## Feedback
9285

93-
Thanks for trying the new features available with `containerd`. Give feedback or
94-
report any bugs you may find through the issues tracker on the
95-
[feedback form](https://dockr.ly/3PODIhD).

content/manuals/desktop/features/desktop-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Use the Docker Desktop CLI
33
linkTitle: Docker Desktop CLI
4-
weight: 90
4+
weight: 100
55
description: How to use the Docker Desktop CLI
66
keywords: cli, docker desktop, macos, windows, linux
77
---

content/manuals/desktop/features/dev-environments/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Dev Environments
33
keywords: Dev Environments, share, local, Compose
44
title: Overview of Dev Environments
55
linkTitle: Dev Environments
6-
weight: 120
6+
weight: 130
77
aliases:
88
- /desktop/dev-environments/
99
params:

content/manuals/desktop/features/gordon/_index.md

Lines changed: 30 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,22 @@ of the Docker ecosystem.
1717

1818
## What is Ask Gordon?
1919

20-
Ask Gordon is a suite of AI-powered capabilities integrated into Docker's tools.
21-
These features, currently in Beta, are not enabled by default, and are not
22-
production-ready. You may also encounter the term "Docker AI" as a broader
23-
reference to this technology.
20+
Ask Gordon provides AI-powered assistance in Docker tools. It offers contextual help for tasks like:
21+
22+
- Improving Dockerfiles
23+
- Running and troubleshooting containers
24+
- Interacting with your images and code
25+
- Finding vulnerabilities or configuration issues
2426

25-
The goal of Ask Gordon is to make Docker's tools for managing images and
26-
containers more intuitive and accessible. It provides contextual assistance
27-
tailored to your local environment, including Dockerfiles, containers, and
28-
applications.
27+
It understands your local environment, including source code, Dockerfiles, and images, to provide personalized and actionable guidance.
2928

30-
Ask Gordon integrates directly with Docker's tools to help you perform specific
31-
tasks. It understands your local setup, such as your local source code and
32-
images. For example, you can ask Gordon to help you identify vulnerabilities in
33-
your project or how to optimize a Dockerfile in your local repository. This
34-
tight integration ensures responses are practical and actionable.
29+
These features are not enabled by default, and are not
30+
production-ready. You may also encounter the term "Docker AI" as a broader
31+
reference to this technology.
3532

36-
> [!NOTE] Ask Gordon is powered by Large Language Models (LLMs). Like all
33+
> [!NOTE]
34+
>
35+
> Ask Gordon is powered by Large Language Models (LLMs). Like all
3736
> LLM-based tools, its responses may sometimes be inaccurate. Always verify the
3837
> information provided.
3938
@@ -81,55 +80,32 @@ making it more effective for all users.
8180
If you have concerns about data collection or usage, you can
8281
[disable](#disable-ask-gordon) the feature at any time.
8382

84-
## Setup
85-
86-
To use this feature, you must have:
87-
88-
- Docker Desktop version 4.38 or later.
89-
90-
Ask Gordon is not enabled by default. To enable the feature:
91-
92-
1. [Sign in](#sign-in) to your Docker account.
93-
2. [Enable the feature](#enable-the-feature) in the Docker Desktop settings.
83+
## Enable Ask Gordon
9484

95-
### Sign in
96-
97-
1. Open Docker Desktop.
98-
2. Select the **Sign in** button.
99-
3. Complete the sign-in process in your web browser.
100-
101-
### Enable the feature
102-
103-
After signing in to your Docker Account, enable the Docker AI feature:
104-
105-
1. Navigate to the **Features in development** tab in settings.
106-
2. Under the **Experimental features** tab, select **Access experimental features**.
107-
3. Select **Apply and restart**.
108-
4. Quit and reopen Docker Desktop to ensure the changes take effect.
109-
5. Open the **Settings** view in Docker Desktop.
110-
6. Navigate to **Features in development**.
111-
7. From the **Beta** tab, check the **Enable Docker AI** checkbox.
85+
1. Sign in to your Docker account.
86+
2. Navigate to the **Features in development** tab in settings.
87+
3. Under the **Experimental features** tab, select **Access experimental features**.
88+
4. Select **Apply and restart**.
89+
5. Quit and reopen Docker Desktop to ensure the changes take effect.
90+
6. Open the **Settings** view in Docker Desktop.
91+
7. Navigate to **Features in development**.
92+
8. From the **Beta** tab, check the **Enable Docker AI** checkbox.
11293

11394
The Docker AI terms of service agreement is displayed. You must agree to the
11495
terms before you can enable the feature. Review the terms and select **Accept
11596
and enable** to continue.
11697

117-
8. Select **Apply & restart**.
98+
9. Select **Apply & restart**.
11899

119100
## Using Ask Gordon
120101

121102
The primary interfaces to Docker's AI capabilities are through the **Ask
122103
Gordon** view in Docker Desktop, or if you prefer to use the CLI: the `docker
123104
ai` CLI command.
124105

125-
If you've used an AI chatbot before, these interfaces will be pretty familiar to
126-
you. You can chat with the Docker AI to get help with your Docker tasks.
127-
128-
### Contextual help
129-
130106
Once you've enabled the Docker AI features, you'll also find references to **Ask
131107
Gordon** in various other places throughout the Docker Desktop user interface.
132-
Whenever you encounter a button with the "sparkles" (✨) icon in the user
108+
Whenever you encounter a button with the **Sparkles** (✨) icon in the user
133109
interface, you can use the button to get contextual support from Ask Gordon.
134110

135111
## Example workflows
@@ -179,7 +155,7 @@ able to help you get set up:
179155
2. Open the **Images** view in Docker Desktop and select the image.
180156
3. Select the **Run** button.
181157

182-
In the _Run a new container_ dialog that opens, you should see a message about
158+
In the **Run a new containe** dialog, you should see a message about
183159
**Ask Gordon**.
184160

185161
![Ask Gordon hint in Docker Desktop](../../images/gordon-run-ctr.png)
@@ -218,13 +194,17 @@ across several dimensions:
218194

219195
## Disable Ask Gordon
220196

197+
### For individual users
198+
221199
If you've enabled Ask Gordon and you want to disable it again:
222200

223201
1. Open the **Settings** view in Docker Desktop.
224202
2. Navigate to **Features in development**.
225203
3. Clear the **Enable Docker AI** checkbox.
226204
4. Select **Apply & restart**.
227205

206+
### For organizations
207+
228208
If you want to disable Ask Gordon for your entire Docker organization, using
229209
[Settings
230210
Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md),
@@ -271,4 +251,4 @@ here's how you can get in touch:
271251
the **Ask Gordon** view in Docker Desktop, or from the CLI by running the
272252
`docker ai feedback` command.
273253

274-
Thank you for helping us improve Ask Gordon.
254+

content/manuals/desktop/features/synchronized-file-sharing.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Synchronized file shares
3-
weight: 50
3+
weight: 70
44
description: Get started with Synchronized file shares on Docker Desktop.
55
keyword: mutagen, file sharing, docker desktop, bind mounts
66
aliases:
@@ -40,7 +40,7 @@ After creating a file share instance, any container using a bind mount that poin
4040
To create a file share instance:
4141
1. Sign in to Docker Desktop.
4242
2. In **Settings**, navigate to the **File sharing** tab within the **Resources** section.
43-
3. In the **Synchronized File Shares** section, select the **Create share** icon.
43+
3. In the **Synchronized file shares** section, select **Create share**.
4444
4. Select a host folder to share. The synchronized file share should initialize and be usable.
4545

4646
File shares take a few seconds to initialize as files are copied into the Docker Desktop VM. During this time, the status indicator displays **Preparing**. There is also a status icon in the footer of the Docker Desktop Dashboard that keeps you updated.
@@ -53,7 +53,7 @@ When the status indicator displays **Watching for filesystem changes**, your fil
5353
5454
> [!TIP]
5555
>
56-
> Compose can now automatically create file shares for bind mounts.
56+
> Docker Compose can automatically create file shares for bind mounts.
5757
> Ensure you're signed in to Docker with a paid subscription and have enabled both **Access experimental features** and **Manage Synchronized file shares with Compose** in Docker Desktop's settings.
5858
5959
## Explore your file share instance
@@ -93,11 +93,3 @@ In general, use your `.syncignore` file to exclude items that aren't critical to
9393
- POSIX-style Windows paths are not supported. Avoid setting the [`COMPOSE_CONVERT_WINDOWS_PATHS`](/manuals/compose/how-tos/environment-variables/envvars.md#compose_convert_windows_paths) environment variable in Docker Compose.
9494

9595
- If you don't have the correct permissions to create symbolic links and your container attempts to create symbolic links in your file share instance, an **unable to create symbolic link** error message displays. For Windows users, see Microsoft's [Create symbolic links documentation](https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-10/security/threat-protection/security-policy-settings/create-symbolic-links) for best practices and location of the **Create symbolic links** security policy setting. For Mac and Linux users, check that you have write permissions on the folder.
96-
97-
## Feedback and support
98-
99-
To give feedback or report bugs, visit:
100-
101-
- [Docker Desktop for Mac issues on GitHub](https://github.com/docker/for-mac/issues)
102-
- [Docker Desktop for Windows issues on GitHub](https://github.com/docker/for-win/issues)
103-
- [Docker Desktop for Linux issues on GitHub](https://github.com/docker/desktop-linux/issues)

content/manuals/desktop/features/usbip.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Using USB/IP with Docker Desktop
33
linkTitle: USB/IP support
4-
weight: 80
4+
weight: 50
55
description: How to use USB/IP in Docker Desktop
66
keywords: usb, usbip, docker desktop, macos, windows, linux
77
toc_max: 3

content/manuals/desktop/features/vmm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Virtual Machine Manager for Docker Desktop on Mac
33
linkTitle: Virtual Machine Manager
44
keywords: virtualization software, resource allocation, mac, docker desktop, vm monitoring, vm performance, apple silicon
55
description: Discover Docker Desktop for Mac's Virtual Machine Manager (VMM) options, including the new Docker VMM for Apple Silicon, offering enhanced performance and efficiency
6-
weight: 100
6+
weight: 110
77
aliases:
88
- /desktop/vmm/
99
---

content/manuals/desktop/features/wasm.md

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Wasm workloads
3-
weight: 20
3+
weight: 90
44
description: How to run Wasm workloads with Docker Desktop
55
keywords: Docker, WebAssembly, wasm, containerd, engine
66
toc_max: 3
@@ -15,13 +15,16 @@ params:
1515

1616
{{< summary-bar feature_name="Wasm workloads" >}}
1717

18-
Wasm (short for WebAssembly) is a fast, light alternative to the Linux and
19-
Windows containers you’re using in Docker today (with
20-
[some tradeoffs](https://www.docker.com/blog/docker-wasm-technical-preview/)).
18+
WebAssembly (Wasm) is a fast, light alternative Linux and
19+
Windows containers. With Docker Desktop, you can now run Wasm workloads side by side with traditional containers.
2120

22-
This page provides information about the new ability to run Wasm applications
21+
This page provides information about the ability to run Wasm applications
2322
alongside your Linux containers in Docker.
2423

24+
> [!TIP]
25+
>
26+
> Learn more about Wasm use cases and tradeoffs in the [Docker Wasm technical preview blog post](https://www.docker.com/blog/docker-wasm-technical-preview/).
27+
2528
## Turn on Wasm workloads
2629

2730
Wasm workloads require the [containerd image store](containerd.md)
@@ -34,9 +37,7 @@ then pre-existing images and containers will be inaccessible.
3437
4. Select **Apply & restart** to save the settings.
3538
5. In the confirmation dialog, select **Install** to install the Wasm runtimes.
3639

37-
Docker Desktop downloads and installs the following runtimes that you can use
38-
to run Wasm workloads:
39-
40+
Docker Desktop downloads and installs the following runtimes:
4041
- `io.containerd.slight.v1`
4142
- `io.containerd.spin.v2`
4243
- `io.containerd.wasmedge.v1`
@@ -211,16 +212,5 @@ Update your Docker Desktop to the latest version and try again.
211212

212213
## Known issues
213214

214-
- Docker Compose may not exit cleanly when interrupted
215-
- Workaround: Clean up `docker-compose` processes by sending them a SIGKILL
216-
(`killall -9 docker-compose`).
217-
- Pushes to Hub might give an error stating
218-
`server message: insufficient_scope: authorization failed`, even after logging
219-
in using Docker Desktop
220-
- Workaround: Run `docker login` in the CLI
221-
222-
## Feedback
223-
224-
Thanks for trying out Wasm workloads with Docker. Give feedback or report any
225-
bugs you may find through the issues tracker on the
226-
[public roadmap item](https://github.com/docker/roadmap/issues/426).
215+
- Docker Compose may not exit cleanly when interrupted. As a workaround, clean up `docker-compose` processes by sending them a SIGKILL (`killall -9 docker-compose`).
216+
- Pushes to Docker Hub might give an error stating `server message: insufficient_scope: authorization failed`, even after signing in through Docker Desktop. As a workaround, run `docker login` in the CLI

content/manuals/desktop/features/wsl/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ keywords: wsl, wsl2, installing wsl2, wsl installation, docker wsl2, wsl docker,
55
tech preview, wsl install docker, install docker wsl, how to install docker in wsl
66
title: Docker Desktop WSL 2 backend on Windows
77
linkTitle: WSL
8-
weight: 110
8+
weight: 120
99
aliases:
1010
- /docker-for-windows/wsl/
1111
- /docker-for-windows/wsl-tech-preview/

data/summary.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ SSO:
212212
for: Administrators
213213
Synchronized file sharing:
214214
subscription: [Pro, Team, Business]
215-
requires: Docker Desktop [4.27](/manuals/desktop/release-notes.md#4270) and later
216215
USB/IP support:
217216
requires: Docker Desktop [4.35.0](/manuals/desktop/release-notes.md#4350) and later
218217
for: Docker Desktop for Mac, Linux, and Windows with the Hyper-V backend

0 commit comments

Comments
 (0)