Skip to content

Commit 83ea065

Browse files
committed
Merge branch 'main' into python-docker-guide-v2
2 parents 7aeb66a + 9eff1ba commit 83ea065

File tree

27 files changed

+103
-81
lines changed

27 files changed

+103
-81
lines changed

.vscode/docker.code-snippets

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,9 @@
3939
],
4040
"description": "Insert a Hugo tabs block with two tabs and snippet stops for names and content",
4141
},
42+
"Insert a Button": {
43+
"prefix": ["button"],
44+
"body": ["{{< button url=\"$1\" text=\"$2\" >}}"],
45+
"description": "Insert a Hugo button",
46+
},
4247
}

_vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# github.com/moby/moby v28.2.0+incompatible
1+
# github.com/moby/moby v28.2.1+incompatible
22
# github.com/moby/buildkit v0.22.0
33
# github.com/docker/buildx v0.24.0
4-
# github.com/docker/cli v28.2.0+incompatible
4+
# github.com/docker/cli v28.2.1+incompatible
55
# github.com/docker/compose/v2 v2.36.2
66
# github.com/docker/scout-cli v1.15.0

assets/css/components.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@
9494
@apply h-12 w-12 overflow-hidden;
9595
}
9696
}
97+
.button {
98+
@apply mt-1 inline-block rounded-sm bg-blue-500 p-1 px-3 text-blue-50 text-white hover:bg-blue-600 dark:bg-blue-500 hover:dark:bg-blue-400;
99+
}
97100

98101
.summary-bar {
99102
@apply my-1 mt-4 flex flex-col rounded-sm border-1 border-gray-100 bg-gray-50 p-4 dark:border-gray-800 dark:bg-gray-900;

assets/css/global.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,6 @@ input[type="search"]::-ms-clear {
104104
list-style-type: lower-roman;
105105
}
106106
}
107+
.navbar-group:first-of-type {
108+
margin-top: 0.2rem !important;
109+
}

assets/css/utilities.css

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,20 @@
118118
}
119119
}
120120

121+
@utility navbar-entry-margin {
122+
@apply px-2 py-1;
123+
}
124+
125+
@utility navbar-group {
126+
@apply mt-5;
127+
}
128+
129+
@utility navbar-entry-background-current {
130+
@apply bg-gray-100 dark:bg-gray-900;
131+
}
121132
@utility navbar-group-font-title {
122133
font-size: var(--color-navbar-group-font-title-size);
123-
@apply font-semibold uppercase;
134+
@apply pb-1.5 font-semibold uppercase;
124135
color: var(--color-navbar-text);
125136
.dark & {
126137
color: var(--color-navbar-text-dark);
@@ -240,3 +251,6 @@
240251
}
241252
}
242253
}
254+
@utility chip {
255+
@apply border-divider-light dark:border-divider-dark inline-flex items-center gap-1 rounded-full border bg-gray-100 px-2 text-sm text-gray-800 select-none dark:bg-gray-700 dark:text-gray-200;
256+
}

content/get-started/introduction/get-docker-desktop.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ This guide will walk you through the installation process, enabling you to exper
2626
> Commercial use of Docker Desktop in larger enterprises (more than 250
2727
> employees OR more than $10 million USD in annual revenue) requires a [paid subscription](https://www.docker.com/pricing/?_gl=1*1nyypal*_ga*MTYxMTUxMzkzOS4xNjgzNTM0MTcw*_ga_XJWPQMJYHQ*MTcxNjk4MzU4Mi4xMjE2LjEuMTcxNjk4MzkzNS4xNy4wLjA.).
2828
29+
<div class="not-prose">
2930
{{< card
3031
title="Docker Desktop for Mac"
3132
description="[Download (Apple Silicon)](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64) | [Download (Intel)](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64) | [Install instructions](/desktop/setup/install/mac-install)"
@@ -40,7 +41,7 @@ This guide will walk you through the installation process, enabling you to exper
4041
title="Docker Desktop for Linux"
4142
description="[Install instructions](/desktop/setup/install/linux/)"
4243
icon="/icons/Linux.svg" >}}
43-
44+
</div>
4445

4546
Once it's installed, complete the setup process and you're all set to run a Docker container.
4647

content/get-started/resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Docker and the broader community of Docker experts have put together many differ
99

1010
## Docker Training
1111

12-
Expand your knowledge on all things Docker with [basic to advanced trainings from Docker experts](https://www.docker.com/resources/trainings/).
12+
Expand your knowledge on all things Docker with [basic to advanced trainings from Docker experts](https://www.docker.com/trainings/).
1313

1414
You can find recorded content at your own convenience, or register for a live session to participate in Q&A.
1515

content/manuals/ai/model-runner.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,11 @@ Models are pulled from Docker Hub the first time they're used and stored locally
4040
4. Quit and reopen Docker Desktop to ensure the changes take effect.
4141
5. Open the **Settings** view in Docker Desktop.
4242
6. Navigate to **Features in development**.
43-
7. From the **Beta** tab, check the **Enable Docker Model Runner** setting.
43+
7. From the **Beta** tab, tick the **Enable Docker Model Runner** setting.
44+
8. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting.
4445

4546
You can now use the `docker model` command in the CLI and view and interact with your local models in the **Models** tab in the Docker Desktop Dashboard.
4647

47-
### Enable DMR in Docker Engine
48-
49-
1. Ensure you have installed [Docker Engine](/engine/install/).
50-
2. DMR is available as a package. To install it, run:
51-
52-
```console
53-
apt install docker-model-plugin
54-
```
55-
5648
## Available commands
5749

5850
### Model runner status

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Additionally, with WSL 2, the time required to start a Docker daemon after a col
2323

2424
Before you turn on the Docker Desktop WSL 2 feature, ensure you have:
2525

26-
- At a minimum WSL version 1.1.3.0., but ideally the latest version of WSL to [avoid Docker Desktop not working as expected](best-practices.md).
26+
- At a minimum WSL version 2.1.5, but ideally the latest version of WSL to [avoid Docker Desktop not working as expected](best-practices.md).
2727
- Met the Docker Desktop for Windows' [system requirements](/manuals/desktop/setup/install/windows-install.md#system-requirements).
2828
- Installed the WSL 2 feature on Windows. For detailed instructions, refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
2929

content/manuals/desktop/features/wsl/best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ aliases:
77
- /desktop/wsl/best-practices/
88
---
99

10-
- Always use the latest version of WSL. At a minimum you must use WSL version 1.1.3.0., otherwise Docker Desktop may not work as expected. Testing, development, and documentation is based on the newest kernel versions. Older versions of WSL can cause:
10+
- Always use the latest version of WSL. At a minimum you must use WSL version 2.1.5, otherwise Docker Desktop may not work as expected. Testing, development, and documentation is based on the newest kernel versions. Older versions of WSL can cause:
1111
- Docker Desktop to hang periodically or when upgrading
1212
- Deployment via SCCM to fail
1313
- The `vmmem.exe` to consume all memory

0 commit comments

Comments
 (0)