Skip to content

Commit b57afe9

Browse files
authored
Merge pull request #21788 from docker/published-update
publish updates from main
2 parents 59e9a15 + ab43bae commit b57afe9

File tree

19 files changed

+68
-18
lines changed

19 files changed

+68
-18
lines changed

content/manuals/engine/network/tutorials/host.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ host.
2525
Nginx listen on a different port, see the
2626
[documentation for the `nginx` image](https://hub.docker.com/_/nginx/)
2727

28-
- The `host` networking driver only works on Linux hosts, but is available as a
29-
[beta feature](/manuals/release-lifecycle.md#beta) on Docker Desktop version 4.29
30-
and later for Mac, Windows, and Linux. To enable this feature, navigate to the
31-
**Resources** tab in **Settings**, and then under **Network** select **Enable host networking**.
28+
- The `host` networking driver only works on Linux hosts, and as an opt-in
29+
feature in Docker Desktop version 4.34 and later. To enable this feature in
30+
Docker Desktop, navigate to the **Resources** tab in **Settings**, and then
31+
under **Network** select **Enable host networking**.
3232

3333
## Procedure
3434

content/manuals/engine/network/tutorials/macvlan.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ container to it.
2525
to your networking equipment.
2626

2727
- The `macvlan` networking driver only works on Linux hosts, and is not supported
28-
on Docker Desktop for Mac, Docker Desktop for Windows, or Docker EE for Windows Server.
28+
on Docker Desktop or Docker Engine on Windows.
2929

3030
- You need at least version 3.9 of the Linux kernel, and version 4.0 or higher
3131
is recommended.

content/manuals/engine/storage/drivers/aufs-driver.md

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ potential performance advantages over the `aufs` storage driver.
2525

2626
- For Docker Engine - Community, AUFS is supported on Ubuntu, and on Debian versions prior to
2727
Stretch.
28-
- For Docker EE, AUFS is supported on Ubuntu.
2928
- If you use Ubuntu, you need to add the AUFS module to the kernel. If you do
3029
not install these packages, you need to use `overlay2`.
3130
- AUFS cannot use the following backing filesystems: `aufs`, `btrfs`, or

content/reference/cli/docker/build.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: docker build
3+
build:
4+
render: never
5+
sidebar:
6+
goto: /reference/cli/docker/buildx/build/
7+
---

content/reference/cli/docker/container/exec.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
datafolder: engine-cli
33
datafile: docker_container_exec
4-
linkTitle: docker exec
54
title: docker container exec
65
aliases:
76
- /edge/engine/reference/commandline/container_exec/

content/reference/cli/docker/container/ls.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
datafolder: engine-cli
33
datafile: docker_container_ls
4-
linkTitle: docker ps
54
title: docker container ls
65
aliases:
76
- /edge/engine/reference/commandline/container_ls/

content/reference/cli/docker/container/run.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
datafolder: engine-cli
33
datafile: docker_container_run
4-
linkTitle: docker run
54
title: docker container run
65
aliases:
76
- /engine/reference/commandline/container_run/

content/reference/cli/docker/exec.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: docker exec
3+
build:
4+
render: never
5+
sidebar:
6+
goto: /reference/cli/docker/container/exec/
7+
---

content/reference/cli/docker/image/ls.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
datafolder: engine-cli
33
datafile: docker_image_ls
4-
linkTitle: docker images
54
title: docker image ls
65
aliases:
76
- /edge/engine/reference/commandline/image_ls/

content/reference/cli/docker/image/pull.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
datafolder: engine-cli
33
datafile: docker_image_pull
4-
linkTitle: docker pull
54
title: docker image pull
65
aliases:
76
- /edge/engine/reference/commandline/image_pull/

content/reference/cli/docker/image/push.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
datafolder: engine-cli
33
datafile: docker_image_push
4-
linkTitle: docker push
54
title: docker image push
65
aliases:
76
- /edge/engine/reference/commandline/image_push/
+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: docker images
3+
build:
4+
render: never
5+
sidebar:
6+
goto: /reference/cli/docker/image/ls/
7+
---

content/reference/cli/docker/info.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: docker info
3+
build:
4+
render: never
5+
sidebar:
6+
goto: /reference/cli/docker/system/info/
7+
---

content/reference/cli/docker/ps.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: docker ps
3+
build:
4+
render: never
5+
sidebar:
6+
goto: /reference/cli/docker/container/ls/
7+
---

content/reference/cli/docker/pull.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: docker pull
3+
build:
4+
render: never
5+
sidebar:
6+
goto: /reference/cli/docker/image/pull/
7+
---

content/reference/cli/docker/push.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: docker push
3+
build:
4+
render: never
5+
sidebar:
6+
goto: /reference/cli/docker/image/push/
7+
---

content/reference/cli/docker/run.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: docker run
3+
build:
4+
render: never
5+
sidebar:
6+
goto: /reference/cli/docker/container/run/
7+
---

content/reference/cli/docker/system/info.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
datafolder: engine-cli
33
datafile: docker_system_info
4-
linkTitle: docker info
54
title: docker system info
65
aliases:
76
- /edge/engine/reference/commandline/system_info/

layouts/_default/cli.html

+7-5
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,13 @@ <h1 class="scroll-mt-36">{{ .Title }}</h1>
183183
</thead>
184184
<tbody>
185185
{{ range .Pages }}
186-
<tr>
187-
<td class="text-left"><a class="link" href="{{ .Permalink }}"><code>{{ .Title }}</code></a></th>
188-
{{ $data := index (index site.Data .Params.datafolder) .Params.datafile }}
189-
<td class="text-left">{{ $data.short }}</th>
190-
</tr>
186+
{{- if and .Params.datafolder .Params.datafile }}
187+
<tr>
188+
<td class="text-left"><a class="link" href="{{ .Permalink }}"><code>{{ .Title }}</code></a></th>
189+
{{ $data := index (index site.Data .Params.datafolder) .Params.datafile }}
190+
<td class="text-left">{{ $data.short }}</th>
191+
</tr>
192+
{{- end }}
191193
{{ end }}
192194
</tbody>
193195
</table>

0 commit comments

Comments
 (0)