Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

publish updates from main #21788

Merged
merged 7 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions content/manuals/engine/network/tutorials/host.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ host.
Nginx listen on a different port, see the
[documentation for the `nginx` image](https://hub.docker.com/_/nginx/)

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

## Procedure

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/engine/network/tutorials/macvlan.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ container to it.
to your networking equipment.

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

- You need at least version 3.9 of the Linux kernel, and version 4.0 or higher
is recommended.
Expand Down
1 change: 0 additions & 1 deletion content/manuals/engine/storage/drivers/aufs-driver.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ potential performance advantages over the `aufs` storage driver.

- For Docker Engine - Community, AUFS is supported on Ubuntu, and on Debian versions prior to
Stretch.
- For Docker EE, AUFS is supported on Ubuntu.
- If you use Ubuntu, you need to add the AUFS module to the kernel. If you do
not install these packages, you need to use `overlay2`.
- AUFS cannot use the following backing filesystems: `aufs`, `btrfs`, or
Expand Down
7 changes: 7 additions & 0 deletions content/reference/cli/docker/build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: docker build
build:
render: never
sidebar:
goto: /reference/cli/docker/buildx/build/
---
1 change: 0 additions & 1 deletion content/reference/cli/docker/container/exec.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
datafolder: engine-cli
datafile: docker_container_exec
linkTitle: docker exec
title: docker container exec
aliases:
- /edge/engine/reference/commandline/container_exec/
Expand Down
1 change: 0 additions & 1 deletion content/reference/cli/docker/container/ls.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
datafolder: engine-cli
datafile: docker_container_ls
linkTitle: docker ps
title: docker container ls
aliases:
- /edge/engine/reference/commandline/container_ls/
Expand Down
1 change: 0 additions & 1 deletion content/reference/cli/docker/container/run.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
datafolder: engine-cli
datafile: docker_container_run
linkTitle: docker run
title: docker container run
aliases:
- /engine/reference/commandline/container_run/
Expand Down
7 changes: 7 additions & 0 deletions content/reference/cli/docker/exec.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: docker exec
build:
render: never
sidebar:
goto: /reference/cli/docker/container/exec/
---
1 change: 0 additions & 1 deletion content/reference/cli/docker/image/ls.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
datafolder: engine-cli
datafile: docker_image_ls
linkTitle: docker images
title: docker image ls
aliases:
- /edge/engine/reference/commandline/image_ls/
Expand Down
1 change: 0 additions & 1 deletion content/reference/cli/docker/image/pull.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
datafolder: engine-cli
datafile: docker_image_pull
linkTitle: docker pull
title: docker image pull
aliases:
- /edge/engine/reference/commandline/image_pull/
Expand Down
1 change: 0 additions & 1 deletion content/reference/cli/docker/image/push.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
datafolder: engine-cli
datafile: docker_image_push
linkTitle: docker push
title: docker image push
aliases:
- /edge/engine/reference/commandline/image_push/
Expand Down
7 changes: 7 additions & 0 deletions content/reference/cli/docker/images.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: docker images
build:
render: never
sidebar:
goto: /reference/cli/docker/image/ls/
---
7 changes: 7 additions & 0 deletions content/reference/cli/docker/info.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: docker info
build:
render: never
sidebar:
goto: /reference/cli/docker/system/info/
---
7 changes: 7 additions & 0 deletions content/reference/cli/docker/ps.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: docker ps
build:
render: never
sidebar:
goto: /reference/cli/docker/container/ls/
---
7 changes: 7 additions & 0 deletions content/reference/cli/docker/pull.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: docker pull
build:
render: never
sidebar:
goto: /reference/cli/docker/image/pull/
---
7 changes: 7 additions & 0 deletions content/reference/cli/docker/push.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: docker push
build:
render: never
sidebar:
goto: /reference/cli/docker/image/push/
---
7 changes: 7 additions & 0 deletions content/reference/cli/docker/run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: docker run
build:
render: never
sidebar:
goto: /reference/cli/docker/container/run/
---
1 change: 0 additions & 1 deletion content/reference/cli/docker/system/info.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
datafolder: engine-cli
datafile: docker_system_info
linkTitle: docker info
title: docker system info
aliases:
- /edge/engine/reference/commandline/system_info/
Expand Down
12 changes: 7 additions & 5 deletions layouts/_default/cli.html
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,13 @@ <h1 class="scroll-mt-36">{{ .Title }}</h1>
</thead>
<tbody>
{{ range .Pages }}
<tr>
<td class="text-left"><a class="link" href="{{ .Permalink }}"><code>{{ .Title }}</code></a></th>
{{ $data := index (index site.Data .Params.datafolder) .Params.datafile }}
<td class="text-left">{{ $data.short }}</th>
</tr>
{{- if and .Params.datafolder .Params.datafile }}
<tr>
<td class="text-left"><a class="link" href="{{ .Permalink }}"><code>{{ .Title }}</code></a></th>
{{ $data := index (index site.Data .Params.datafolder) .Params.datafile }}
<td class="text-left">{{ $data.short }}</th>
</tr>
{{- end }}
{{ end }}
</tbody>
</table>
Expand Down
Loading