From 08bbe48015eae62bef1ddc541b24cb8905b800d2 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:04:26 +0100 Subject: [PATCH 1/4] chore: remove stray mentions of Docker EE Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/manuals/engine/network/tutorials/macvlan.md | 2 +- content/manuals/engine/storage/drivers/aufs-driver.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/content/manuals/engine/network/tutorials/macvlan.md b/content/manuals/engine/network/tutorials/macvlan.md index 9b8bdf6280eb..12f9719c9c2c 100644 --- a/content/manuals/engine/network/tutorials/macvlan.md +++ b/content/manuals/engine/network/tutorials/macvlan.md @@ -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. diff --git a/content/manuals/engine/storage/drivers/aufs-driver.md b/content/manuals/engine/storage/drivers/aufs-driver.md index dccad394e9d1..b966b5530ab5 100644 --- a/content/manuals/engine/storage/drivers/aufs-driver.md +++ b/content/manuals/engine/storage/drivers/aufs-driver.md @@ -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 From 2530d03f9a04fffd01c4c63aff8c17f6ff6d6778 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:07:44 +0100 Subject: [PATCH 2/4] networking: host driver in dd is no longer beta Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/manuals/engine/network/tutorials/host.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/manuals/engine/network/tutorials/host.md b/content/manuals/engine/network/tutorials/host.md index 607800ca0030..61a46b63cf60 100644 --- a/content/manuals/engine/network/tutorials/host.md +++ b/content/manuals/engine/network/tutorials/host.md @@ -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 From effa260c241e3ffae892ca71d2546da06235c2b1 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:34:44 +0100 Subject: [PATCH 3/4] hugo: only render subcommand link if cli data exists Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- layouts/_default/cli.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/layouts/_default/cli.html b/layouts/_default/cli.html index a18752576c22..f9cd66d1dc79 100644 --- a/layouts/_default/cli.html +++ b/layouts/_default/cli.html @@ -183,11 +183,13 @@

{{ .Title }}

{{ range .Pages }} - - {{ .Title }} - {{ $data := index (index site.Data .Params.datafolder) .Params.datafile }} - {{ $data.short }} - + {{- if and .Params.datafolder .Params.datafile }} + + {{ .Title }} + {{ $data := index (index site.Data .Params.datafolder) .Params.datafile }} + {{ $data.short }} + + {{- end }} {{ end }} From a2d2b07b7296062727e914b178d2663b996099f1 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:31:27 +0100 Subject: [PATCH 4/4] cli: add sidebar entries for common top-level aliases Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/reference/cli/docker/build.md | 7 +++++++ content/reference/cli/docker/container/exec.md | 1 - content/reference/cli/docker/container/ls.md | 1 - content/reference/cli/docker/container/run.md | 1 - content/reference/cli/docker/exec.md | 7 +++++++ content/reference/cli/docker/image/ls.md | 1 - content/reference/cli/docker/image/pull.md | 1 - content/reference/cli/docker/image/push.md | 1 - content/reference/cli/docker/images.md | 7 +++++++ content/reference/cli/docker/info.md | 7 +++++++ content/reference/cli/docker/ps.md | 7 +++++++ content/reference/cli/docker/pull.md | 7 +++++++ content/reference/cli/docker/push.md | 7 +++++++ content/reference/cli/docker/run.md | 7 +++++++ content/reference/cli/docker/system/info.md | 1 - 15 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 content/reference/cli/docker/build.md create mode 100644 content/reference/cli/docker/exec.md create mode 100644 content/reference/cli/docker/images.md create mode 100644 content/reference/cli/docker/info.md create mode 100644 content/reference/cli/docker/ps.md create mode 100644 content/reference/cli/docker/pull.md create mode 100644 content/reference/cli/docker/push.md create mode 100644 content/reference/cli/docker/run.md diff --git a/content/reference/cli/docker/build.md b/content/reference/cli/docker/build.md new file mode 100644 index 000000000000..79ec94656e78 --- /dev/null +++ b/content/reference/cli/docker/build.md @@ -0,0 +1,7 @@ +--- +title: docker build +build: + render: never +sidebar: + goto: /reference/cli/docker/buildx/build/ +--- diff --git a/content/reference/cli/docker/container/exec.md b/content/reference/cli/docker/container/exec.md index 77589f9ab431..4b583fb18af1 100644 --- a/content/reference/cli/docker/container/exec.md +++ b/content/reference/cli/docker/container/exec.md @@ -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/ diff --git a/content/reference/cli/docker/container/ls.md b/content/reference/cli/docker/container/ls.md index b79e445e4e28..d9a42e15fd26 100644 --- a/content/reference/cli/docker/container/ls.md +++ b/content/reference/cli/docker/container/ls.md @@ -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/ diff --git a/content/reference/cli/docker/container/run.md b/content/reference/cli/docker/container/run.md index c5d770807631..e2af79445ee0 100644 --- a/content/reference/cli/docker/container/run.md +++ b/content/reference/cli/docker/container/run.md @@ -1,7 +1,6 @@ --- datafolder: engine-cli datafile: docker_container_run -linkTitle: docker run title: docker container run aliases: - /engine/reference/commandline/container_run/ diff --git a/content/reference/cli/docker/exec.md b/content/reference/cli/docker/exec.md new file mode 100644 index 000000000000..68acf6d726d3 --- /dev/null +++ b/content/reference/cli/docker/exec.md @@ -0,0 +1,7 @@ +--- +title: docker exec +build: + render: never +sidebar: + goto: /reference/cli/docker/container/exec/ +--- diff --git a/content/reference/cli/docker/image/ls.md b/content/reference/cli/docker/image/ls.md index 4f71a674c0ae..582e31738974 100644 --- a/content/reference/cli/docker/image/ls.md +++ b/content/reference/cli/docker/image/ls.md @@ -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/ diff --git a/content/reference/cli/docker/image/pull.md b/content/reference/cli/docker/image/pull.md index 82a97afc854e..7de6d4396e35 100644 --- a/content/reference/cli/docker/image/pull.md +++ b/content/reference/cli/docker/image/pull.md @@ -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/ diff --git a/content/reference/cli/docker/image/push.md b/content/reference/cli/docker/image/push.md index 8692d8e844f0..c80f932d29b6 100644 --- a/content/reference/cli/docker/image/push.md +++ b/content/reference/cli/docker/image/push.md @@ -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/ diff --git a/content/reference/cli/docker/images.md b/content/reference/cli/docker/images.md new file mode 100644 index 000000000000..abaefb6a2511 --- /dev/null +++ b/content/reference/cli/docker/images.md @@ -0,0 +1,7 @@ +--- +title: docker images +build: + render: never +sidebar: + goto: /reference/cli/docker/image/ls/ +--- diff --git a/content/reference/cli/docker/info.md b/content/reference/cli/docker/info.md new file mode 100644 index 000000000000..f15fb7de2a12 --- /dev/null +++ b/content/reference/cli/docker/info.md @@ -0,0 +1,7 @@ +--- +title: docker info +build: + render: never +sidebar: + goto: /reference/cli/docker/system/info/ +--- diff --git a/content/reference/cli/docker/ps.md b/content/reference/cli/docker/ps.md new file mode 100644 index 000000000000..3e6d2f90040e --- /dev/null +++ b/content/reference/cli/docker/ps.md @@ -0,0 +1,7 @@ +--- +title: docker ps +build: + render: never +sidebar: + goto: /reference/cli/docker/container/ls/ +--- diff --git a/content/reference/cli/docker/pull.md b/content/reference/cli/docker/pull.md new file mode 100644 index 000000000000..9173e78dff69 --- /dev/null +++ b/content/reference/cli/docker/pull.md @@ -0,0 +1,7 @@ +--- +title: docker pull +build: + render: never +sidebar: + goto: /reference/cli/docker/image/pull/ +--- diff --git a/content/reference/cli/docker/push.md b/content/reference/cli/docker/push.md new file mode 100644 index 000000000000..735816235bf4 --- /dev/null +++ b/content/reference/cli/docker/push.md @@ -0,0 +1,7 @@ +--- +title: docker push +build: + render: never +sidebar: + goto: /reference/cli/docker/image/push/ +--- diff --git a/content/reference/cli/docker/run.md b/content/reference/cli/docker/run.md new file mode 100644 index 000000000000..a577ccf651db --- /dev/null +++ b/content/reference/cli/docker/run.md @@ -0,0 +1,7 @@ +--- +title: docker run +build: + render: never +sidebar: + goto: /reference/cli/docker/container/run/ +--- diff --git a/content/reference/cli/docker/system/info.md b/content/reference/cli/docker/system/info.md index 9eafb0730277..65adda3d3af0 100644 --- a/content/reference/cli/docker/system/info.md +++ b/content/reference/cli/docker/system/info.md @@ -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/