diff --git a/content/build/building/packaging.md b/content/build/building/packaging.md index 2f230637c2..ef393333a1 100644 --- a/content/build/building/packaging.md +++ b/content/build/building/packaging.md @@ -38,7 +38,7 @@ Some projects may need distinct Dockerfiles for specific purposes. A common convention is to name these `.Dockerfile`. You can specify the Dockerfile filename using the `--file` flag for the `docker build` command. Refer to the -[`docker build` CLI reference](../../engine/reference/commandline/build.md#file) +[`docker build` CLI reference](../../engine/reference/commandline/image_build.md#file) to learn about the `--file` flag. > **Note** diff --git a/content/build/guide/export.md b/content/build/guide/export.md index 79b086914d..674cf90a83 100644 --- a/content/build/guide/export.md +++ b/content/build/guide/export.md @@ -103,7 +103,7 @@ This is explored later on in this guide. Related information: -- [`docker build --output` CLI reference](../../engine/reference/commandline/build.md#output) +- [`docker build --output` CLI reference](../../engine/reference/commandline/image_build.md#output) - [Build exporters](../exporters/index.md) ## Next steps diff --git a/content/build/guide/intro.md b/content/build/guide/intro.md index 743c571a49..5a55da8cf4 100644 --- a/content/build/guide/intro.md +++ b/content/build/guide/intro.md @@ -160,8 +160,8 @@ container image and created a container from it. Related information: - [Dockerfile reference](../../engine/reference/builder.md) -- [`docker build` CLI reference](../../engine/reference/commandline/build.md) -- [`docker run` CLI reference](../../engine/reference/commandline/run.md) +- [`docker build` CLI reference](../../engine/reference/commandline/image_build.md) +- [`docker run` CLI reference](../../engine/reference/commandline/container_run.md) ## Next steps diff --git a/content/compose/compose-file/compose-file-v2.md b/content/compose/compose-file/compose-file-v2.md index ba75110461..76b08dabdc 100644 --- a/content/compose/compose-file/compose-file-v2.md +++ b/content/compose/compose-file/compose-file-v2.md @@ -273,7 +273,7 @@ An entry with the ip address and hostname is created in `/etc/hosts` inside cont Specify a build’s container isolation technology. On Linux, the only supported value is `default`. On Windows, acceptable values are `default`, `process` and `hyperv`. Refer to the -[Docker Engine docs](../../engine/reference/commandline/run.md#isolation) +[Docker Engine docs](../../engine/reference/commandline/container_run.md#isolation) for details. If unspecified, Compose will use the `isolation` value found in the service's definition @@ -778,7 +778,7 @@ host system to be added. An example of where this is useful is when multiple containers (running as different users) need to all read or write the same file on the host system. That file can be owned by a group shared by all the containers, and specified in `group_add`. See the -[Docker documentation](../../engine/reference/run.md#additional-groups) for more +[Docker documentation](../../engine/reference/commandline/container_run.md#additional-groups) for more details. A full example: @@ -900,7 +900,7 @@ services: Specify a container’s isolation technology. On Linux, the only supported value is `default`. On Windows, acceptable values are `default`, `process` and `hyperv`. Refer to the -[Docker Engine docs](../../engine/reference/commandline/run.md#isolation) +[Docker Engine docs](../../engine/reference/commandline/container_run.md#isolation) for details. ### labels @@ -1557,7 +1557,7 @@ restart: "unless-stopped" ### cpu_count, cpu_percent, cpu\_shares, cpu\_period, cpu\_quota, cpus, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, mem\_swappiness, mem\_reservation, oom_kill_disable, oom_score_adj, privileged, read\_only, shm\_size, stdin\_open, tty, user, working\_dir Each of these is a single value, analogous to its -[docker run](../../engine/reference/run.md#runtime-constraints-on-resources) counterpart. +[docker run](../../engine/reference/commandline/container_run.md#runtime-constraints-on-resources) counterpart. > Added in [version 2.2](compose-versioning.md#version-22) file format. > @@ -1984,4 +1984,4 @@ networks: - [Installing Compose](../install/index.md) - [Compose file versions and upgrading](compose-versioning.md) - [Sample apps with Compose](../samples-for-compose.md) -- [Command line reference](../reference/index.md) \ No newline at end of file +- [Command line reference](../reference/index.md) diff --git a/content/compose/compose-file/compose-file-v3.md b/content/compose/compose-file/compose-file-v3.md index 928a910ed7..29f5a80cbd 100644 --- a/content/compose/compose-file/compose-file-v3.md +++ b/content/compose/compose-file/compose-file-v3.md @@ -1339,7 +1339,7 @@ services: Specify a container’s isolation technology. On Linux, the only supported value is `default`. On Windows, acceptable values are `default`, `process` and `hyperv`. Refer to the -[Docker Engine docs](../../engine/reference/commandline/run.md#isolation) +[Docker Engine docs](../../engine/reference/commandline/container_run.md#isolation) for details. ### labels @@ -1904,7 +1904,7 @@ sysctls: You can only use sysctls that are namespaced in the kernel. Docker does not support changing sysctls inside a container that also modify the host system. For an overview of supported sysctls, refer to -[configure namespaced kernel parameters (sysctls) at runtime](../../engine/reference/commandline/run.md#sysctl). +[configure namespaced kernel parameters (sysctls) at runtime](../../engine/reference/commandline/container_run.md#sysctl). > Note when using docker stack deploy > @@ -2151,7 +2151,7 @@ services: ### domainname, hostname, ipc, mac\_address, privileged, read\_only, shm\_size, stdin\_open, tty, user, working\_dir Each of these is a single value, analogous to its -[docker run](../../engine/reference/run.md) counterpart. Note that `mac_address` is a legacy option. +[docker run](../../engine/reference/commandline/container_run.md) counterpart. Note that `mac_address` is a legacy option. ```yaml user: postgresql diff --git a/content/compose/release-notes.md b/content/compose/release-notes.md index 62e3e0930a..aec8c2918b 100644 --- a/content/compose/release-notes.md +++ b/content/compose/release-notes.md @@ -3245,8 +3245,8 @@ Several new configuration keys have been added to `docker-compose.yml`: - `pid: host`, like `docker run --pid=host`, lets you reuse the same PID namespace as the host machine. - `cpuset`, like `docker run --cpuset-cpus`, lets you specify which CPUs to allow execution in. - `read_only`, like `docker run --read-only`, lets you mount a container's filesystem as read-only. -- `security_opt`, like `docker run --security-opt`, lets you specify [security options](/engine/reference/run/#security-configuration). -- `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](/engine/reference/run/#logging-drivers---log-driver). +- `security_opt`, like `docker run --security-opt`, lets you specify [security options](/engine/reference/commandline/container_run/#security-opt). +- `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](/engine/reference/commandline/container_run/#log-driver). ### Bug fixes diff --git a/content/config/containers/resource_constraints.md b/content/config/containers/resource_constraints.md index c8be3e9abd..f440ab3c81 100644 --- a/content/config/containers/resource_constraints.md +++ b/content/config/containers/resource_constraints.md @@ -15,7 +15,7 @@ on when you should set such limits and the possible implications of setting them Many of these features require your kernel to support Linux capabilities. To check for support, you can use the -[`docker info`](../../engine/reference/commandline/info.md) command. If a capability +[`docker info`](../../engine/reference/commandline/system_info.md) command. If a capability is disabled in your kernel, you may see a warning at the end of the output like the following: diff --git a/content/config/containers/runmetrics.md b/content/config/containers/runmetrics.md index 96241bd7f4..dfa5183d0b 100644 --- a/content/config/containers/runmetrics.md +++ b/content/config/containers/runmetrics.md @@ -25,7 +25,7 @@ redis1 0.07% 796 KB / 64 MB 1.21% redis2 0.07% 2.746 MB / 64 MB 4.29% 1.266 KB / 648 B 12.4 MB / 0 B ``` -The [`docker stats`](../../engine/reference/commandline/stats.md) reference +The [`docker stats`](../../engine/reference/commandline/container_stats.md) reference page has more details about the `docker stats` command. ## Control groups diff --git a/content/config/filter.md b/content/config/filter.md index 317126e687..1029cc51e6 100644 --- a/content/config/filter.md +++ b/content/config/filter.md @@ -95,13 +95,13 @@ description for commands that support the `--filter` flag: - [`docker config ls`](../engine/reference/commandline/config_ls.md) - [`docker container prune`](../engine/reference/commandline/container_prune.md) - [`docker image prune`](../engine/reference/commandline/image_prune.md) -- [`docker images`](../engine/reference/commandline/images.md) +- [`docker image ls`](../engine/reference/commandline/image_ls.md) - [`docker network ls`](../engine/reference/commandline/network_ls.md) - [`docker network prune`](../engine/reference/commandline/network_prune.md) - [`docker node ls`](../engine/reference/commandline/node_ls.md) - [`docker node ps`](../engine/reference/commandline/node_ps.md) - [`docker plugin ls`](../engine/reference/commandline/plugin_ls.md) -- [`docker ps`](../engine/reference/commandline/ps.md) +- [`docker container ls`](../engine/reference/commandline/container_ls.md) - [`docker search`](../engine/reference/commandline/search.md) - [`docker secret ls`](../engine/reference/commandline/secret_ls.md) - [`docker service ls`](../engine/reference/commandline/service_ls.md) diff --git a/content/config/labels-custom-metadata.md b/content/config/labels-custom-metadata.md index 6187a510be..4752ed36e5 100644 --- a/content/config/labels-custom-metadata.md +++ b/content/config/labels-custom-metadata.md @@ -80,15 +80,15 @@ Labels on Swarm nodes and services can be updated dynamically. - Images and containers - [Adding labels to images](../engine/reference/builder.md#label) - - [Overriding a container's labels at runtime](../engine/reference/commandline/run.md#label) + - [Overriding a container's labels at runtime](../engine/reference/commandline/container_run.md#label) - [Inspecting labels on images or containers](../engine/reference/commandline/inspect.md) - - [Filtering images by label](../engine/reference/commandline/images.md#filter) - - [Filtering containers by label](../engine/reference/commandline/ps.md#filter) + - [Filtering images by label](../engine/reference/commandline/image_ls.md#filter) + - [Filtering containers by label](../engine/reference/commandline/container_ls.md#filter) - Local Docker daemons - [Adding labels to a Docker daemon at runtime](../engine/reference/commandline/dockerd.md) - - [Inspecting a Docker daemon's labels](../engine/reference/commandline/info.md) + - [Inspecting a Docker daemon's labels](../engine/reference/commandline/system_info.md) - Volumes diff --git a/content/desktop/backup-and-restore.md b/content/desktop/backup-and-restore.md index 8d1d0d67a1..b472070616 100644 --- a/content/desktop/backup-and-restore.md +++ b/content/desktop/backup-and-restore.md @@ -14,7 +14,7 @@ computer, for example. ## Save your data -1. Commit your containers to an image with [`docker container commit`](../engine/reference/commandline/commit.md). +1. Commit your containers to an image with [`docker container commit`](../engine/reference/commandline/container_commit.md). Committing a container stores the container filesystem changes and some of the container's configuration, for example labels and environment-variables, as a local image. Be aware that environment variables may contain sensitive @@ -26,13 +26,13 @@ computer, for example. If you used a [named volume](../storage/index.md#more-details-about-mount-types) to store container data, such as databases, refer to the [back up, restore, or migrate data volumes](../storage/volumes.md#back-up-restore-or-migrate-data-volumes) page in the storage section. -2. Use [`docker push`](../engine/reference/commandline/push.md) to push any +2. Use [`docker push`](../engine/reference/commandline/image_push.md) to push any images you have built locally and want to keep to the [Docker Hub registry](../docker-hub/index.md). Make sure to configure the [repository's visibility as "private"](../docker-hub/repos/index.md) for images that should not be publicly accessible. - Alternatively, use [`docker image save -o images.tar image1 [image2 ...]`](../engine/reference/commandline/save.md) + Alternatively, use [`docker image save -o images.tar image1 [image2 ...]`](../engine/reference/commandline/image_save.md) to save any images you want to keep to a local tar file. After backing up your data, you can uninstall the current version of Docker Desktop @@ -40,13 +40,13 @@ and [install a different version](release-notes.md) or reset Docker Desktop to f ## Restore your data -1. Use [`docker pull`](../engine/reference/commandline/pull.md) to restore images +1. Use [`docker pull`](../engine/reference/commandline/image_pull.md) to restore images you pushed to Docker Hub. - If you backed up your images to a local tar file, use [`docker image load -i images.tar`](../engine/reference/commandline/load.md) + If you backed up your images to a local tar file, use [`docker image load -i images.tar`](../engine/reference/commandline/image_load.md) to restore previously saved images. -2. Re-create your containers if needed, using [`docker run`](../engine/reference/commandline/run.md), +2. Re-create your containers if needed, using [`docker run`](../engine/reference/commandline/container_run.md), or [Docker Compose](../compose/index.md). -Refer to the [backup, restore, or migrate data volumes](../storage/volumes.md#back-up-restore-or-migrate-data-volumes) page in the storage section to restore volume data. \ No newline at end of file +Refer to the [backup, restore, or migrate data volumes](../storage/volumes.md#back-up-restore-or-migrate-data-volumes) page in the storage section to restore volume data. diff --git a/content/desktop/hardened-desktop/settings-management/configure.md b/content/desktop/hardened-desktop/settings-management/configure.md index eaadd1a326..90a83f6d0e 100644 --- a/content/desktop/hardened-desktop/settings-management/configure.md +++ b/content/desktop/hardened-desktop/settings-management/configure.md @@ -150,7 +150,7 @@ The following `admin-settings.json` code and table provides an example of the re |`scout`|| Setting `useBackgroundIndexing` to `false` disables automatic indexing of images loaded to the image store. Setting `sbomIndexing` to `false` prevents the manual indexing triggered by inspecting an image in Docker Desktop.

**Note**: Users can still use the `docker scout` CLI commands to index images, even if indexing is disabled in Settings Management. | | `allowExperimentalFeatures`| | If `value` is set to `false`, experimental features are disabled.| | `allowBetaFeatures`| | If `value` is set to `false`, beta features are disabled.| -| `blockDockerLoad` | | If `value` is set to `true`, users are no longer able to run [`docker load`](../../../engine/reference/commandline/load.md) and receive an error if they try to.| +| `blockDockerLoad` | | If `value` is set to `true`, users are no longer able to run [`docker load`](../../../engine/reference/commandline/image_load.md) and receive an error if they try to.| ### Step three: Re-launch Docker Desktop >**Note** diff --git a/content/desktop/networking.md b/content/desktop/networking.md index 9738ff10a8..4274712ed2 100644 --- a/content/desktop/networking.md +++ b/content/desktop/networking.md @@ -162,5 +162,5 @@ container to random ports on the host. $ docker run -d -P --name webserver nginx ``` -See the [run command](../engine/reference/commandline/run.md) for more details on -publish options used with `docker run`. \ No newline at end of file +See the [run command](../engine/reference/commandline/container_run.md) for more details on +publish options used with `docker run`. diff --git a/content/desktop/previous-versions/archive-mac.md b/content/desktop/previous-versions/archive-mac.md index 206acf16f7..eac97cfdd1 100644 --- a/content/desktop/previous-versions/archive-mac.md +++ b/content/desktop/previous-versions/archive-mac.md @@ -35,7 +35,7 @@ This page contains release notes for older versions of Docker Desktop for Mac. - Re-enable raw as the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625) * Bug fixes and minor changes - - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/save/#examples) and [back up volumes](../../storage/volumes.md#back-up-restore-or-migrate-data-volumes) + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/image_save/#examples) and [back up volumes](../../storage/volumes.md#back-up-restore-or-migrate-data-volumes) - OS X El Captain 10.11 is deprecated in Docker Desktop. You will not be able to install updates after Docker Desktop 18.06.x. We recommend upgrading to the latest version of macOS. - Fix bug which would cause VM logs to be written to RAM rather than disk in some cases, and the VM to hang. See [docker/for-mac#2984](https://github.com/docker/for-mac/issues/2984) - Fix network connection leak triggered by haproxy TCP health-checks [docker/for-mac#1132](https://github.com/docker/for-mac/issues/1132) @@ -562,4 +562,4 @@ events or unexpected unmounts. * Docker 1.12.0 * Docker Machine 0.8.0 -* Docker Compose 1.8.0 \ No newline at end of file +* Docker Compose 1.8.0 diff --git a/content/desktop/previous-versions/archive-windows.md b/content/desktop/previous-versions/archive-windows.md index 5bc9ff2aa5..792c5d3a73 100644 --- a/content/desktop/previous-versions/archive-windows.md +++ b/content/desktop/previous-versions/archive-windows.md @@ -49,7 +49,7 @@ This page contains release notes for older versions of Docker Desktop for Window - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as Docker commands. See [the Kubernetes section](../kubernetes.md) * Bug fixes and minor changes - - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset the disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/save/#examples) and [backup volumes](../../storage/volumes.md#back-up-restore-or-migrate-data-volumes) + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset the disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/image_save/#examples) and [backup volumes](../../storage/volumes.md#back-up-restore-or-migrate-data-volumes) - Fix bug which would in some cases cause virtual machine logs to be written to RAM rather than disk, and the virtual machine to hang. - Fix security issue with named pipe connection to docker service. - Fix VPNKit memory leak. Fixes [docker/for-win#2087](https://github.com/docker/for-win/issues/2087), [moby/vpnkit#371](https://github.com/moby/vpnkit/issues/371) @@ -527,4 +527,4 @@ We did not distribute a 1.12.4 stable release * Docker 1.12.0 * Docker Machine 0.8.0 -* Docker Compose 1.8.0 \ No newline at end of file +* Docker Compose 1.8.0 diff --git a/content/desktop/previous-versions/edge-releases-mac.md b/content/desktop/previous-versions/edge-releases-mac.md index 3420806222..7379be6ec0 100644 --- a/content/desktop/previous-versions/edge-releases-mac.md +++ b/content/desktop/previous-versions/edge-releases-mac.md @@ -732,7 +732,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - Add an experimental SOCKS server to allow access to container networks, see [docker/for-mac#2670](https://github.com/docker/for-mac/issues/2670#issuecomment-372365274). Also see [docker/for-mac#2721](https://github.com/docker/for-mac/issues/2721) * Bug fixes and minor changes - - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/save/#examples) and [back up volumes](../../storage/volumes.md#back-up-restore-or-migrate-data-volumes) + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/image_save/#examples) and [back up volumes](../../storage/volumes.md#back-up-restore-or-migrate-data-volumes) - Fix startup issue with AUFS [docker/for-mac#2804](https://github.com/docker/for-mac/issues/2804) - Fix status bug which could prevent the Kubernetes cluster from starting. Fixes [docker/for-mac#2990](https://github.com/docker/for-mac/issues/2990) - Fix bug which would cause virtual machine logs to be written to RAM rather than disk in some cases, and the virtual machine to hang. See [docker/for-mac#2984](https://github.com/docker/for-mac/issues/2984) @@ -2441,4 +2441,4 @@ work yet. - Fixed setting hostname -- Fixed permissions on `usr/local` symbolic links \ No newline at end of file +- Fixed permissions on `usr/local` symbolic links diff --git a/content/desktop/previous-versions/edge-releases-windows.md b/content/desktop/previous-versions/edge-releases-windows.md index ffcd5e0468..eac960beb7 100644 --- a/content/desktop/previous-versions/edge-releases-windows.md +++ b/content/desktop/previous-versions/edge-releases-windows.md @@ -953,7 +953,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - New Kubernetes menu item allowing to switch Kubernetes context & connect to clusters other than the local one. * Bug fixes and minor changes - - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/save/#examples) and [back up volumes](../../storage/volumes.md#back-up-restore-or-migrate-data-volumes) + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/image_save/#examples) and [back up volumes](../../storage/volumes.md#back-up-restore-or-migrate-data-volumes) - Fix startup issue with AUFS - Fix status bug which could prevent the kubernetes cluster from starting. - Fix bug which would cause VM logs to be written to RAM rather than disk in some cases, and the VM to hang. @@ -2602,4 +2602,4 @@ are working on a solution. **Networking** - - live debugging Node.js application \ No newline at end of file + - live debugging Node.js application diff --git a/content/desktop/release-notes.md b/content/desktop/release-notes.md index 470cda722b..3a6be4a31d 100644 --- a/content/desktop/release-notes.md +++ b/content/desktop/release-notes.md @@ -1897,7 +1897,7 @@ CVE-2021-44228](https://www.docker.com/blog/apache-log4j-2-cve-2021-44228/). Docker Dashboard incorrectly displays the container memory usage as zero on Hyper-V based machines. -You can use the [`docker stats`](../engine/reference/commandline/stats.md) +You can use the [`docker stats`](../engine/reference/commandline/container_stats.md) command on the command line as a workaround to view the actual memory usage. See [docker/for-mac#6076](https://github.com/docker/for-mac/issues/6076). diff --git a/content/develop/develop-images/instructions.md b/content/develop/develop-images/instructions.md index ebbcf337b0..79c43aad58 100644 --- a/content/develop/develop-images/instructions.md +++ b/content/develop/develop-images/instructions.md @@ -330,7 +330,7 @@ as part of your build. `ADD` is better than manually adding files using something like `wget` and `tar`, because it ensures a more precise build cache. `ADD` also has built-in support for checksum validation of the remote resources, and a protocol for parsing branches, tags, and subdirectories from -[Git URLs](../../engine/reference/commandline/build.md#git-repositories). +[Git URLs](../../engine/reference/commandline/image_build.md#git-repositories). The following example uses `ADD` to download a .NET installer. Combined with multi-stage builds, only the .NET runtime remains in the final stage, no diff --git a/content/docker-hub/builds/advanced.md b/content/docker-hub/builds/advanced.md index d1b42daa84..d6e540775f 100644 --- a/content/docker-hub/builds/advanced.md +++ b/content/docker-hub/builds/advanced.md @@ -115,11 +115,11 @@ $ docker build --build-arg CUSTOM=$VAR -f $DOCKERFILE_PATH -t $IMAGE_NAME . > **Important** > -> A `hooks/build` file overrides the basic [docker build](../../engine/reference/commandline/build.md) command used by the builder, so you must include a similar build command in the hook or +> A `hooks/build` file overrides the basic [docker build](../../engine/reference/commandline/image_build.md) command used by the builder, so you must include a similar build command in the hook or the automated build fails. { .important } -Refer to the [docker build documentation](../../engine/reference/commandline/build.md#build-arg) +Refer to the [docker build documentation](../../engine/reference/commandline/image_build.md#build-arg) to learn more about Docker build-time variables. #### Push to multiple repositories @@ -157,4 +157,4 @@ you do one of the following: ```console $ git fetch --unshallow origin - ``` \ No newline at end of file + ``` diff --git a/content/engine/reference/commandline/attach.md b/content/engine/reference/commandline/attach.md deleted file mode 100644 index e41a6a6b0e..0000000000 --- a/content/engine/reference/commandline/attach.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_attach -title: docker attach -aliases: -- /edge/engine/reference/commandline/attach/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/build.md b/content/engine/reference/commandline/build.md deleted file mode 100644 index ae89d8d42a..0000000000 --- a/content/engine/reference/commandline/build.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_build -title: docker build -aliases: -- /edge/engine/reference/commandline/build/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/builder_build.md b/content/engine/reference/commandline/builder_build.md deleted file mode 100644 index 38bcb03793..0000000000 --- a/content/engine/reference/commandline/builder_build.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_builder_build -title: docker builder build -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/commit.md b/content/engine/reference/commandline/commit.md deleted file mode 100644 index c72d265e63..0000000000 --- a/content/engine/reference/commandline/commit.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_commit -title: docker commit -aliases: -- /edge/engine/reference/commandline/commit/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/container_attach.md b/content/engine/reference/commandline/container_attach.md index e28e847b23..ef3896d121 100644 --- a/content/engine/reference/commandline/container_attach.md +++ b/content/engine/reference/commandline/container_attach.md @@ -4,6 +4,7 @@ datafile: docker_container_attach title: docker container attach aliases: - /edge/engine/reference/commandline/container_attach/ +- /engine/reference/commandline/attach/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_commit.md b/content/engine/reference/commandline/container_commit.md index 0029f6fbb1..2fa5b15519 100644 --- a/content/engine/reference/commandline/container_commit.md +++ b/content/engine/reference/commandline/container_commit.md @@ -4,6 +4,7 @@ datafile: docker_container_commit title: docker container commit aliases: - /edge/engine/reference/commandline/container_commit/ +- /engine/reference/commandline/commit/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_cp.md b/content/engine/reference/commandline/container_cp.md index 92adc074ac..94c595b5e8 100644 --- a/content/engine/reference/commandline/container_cp.md +++ b/content/engine/reference/commandline/container_cp.md @@ -4,6 +4,7 @@ datafile: docker_container_cp title: docker container cp aliases: - /edge/engine/reference/commandline/container_cp/ +- /engine/reference/commandline/cp/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_create.md b/content/engine/reference/commandline/container_create.md index be14d03a53..72bf509ee9 100644 --- a/content/engine/reference/commandline/container_create.md +++ b/content/engine/reference/commandline/container_create.md @@ -4,6 +4,7 @@ datafile: docker_container_create title: docker container create aliases: - /edge/engine/reference/commandline/container_create/ +- /engine/reference/commandline/create/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_diff.md b/content/engine/reference/commandline/container_diff.md index 9de56b1164..3a93f545b6 100644 --- a/content/engine/reference/commandline/container_diff.md +++ b/content/engine/reference/commandline/container_diff.md @@ -4,6 +4,7 @@ datafile: docker_container_diff title: docker container diff aliases: - /edge/engine/reference/commandline/container_diff/ +- /engine/reference/commandline/diff/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_exec.md b/content/engine/reference/commandline/container_exec.md index 17c79f2e93..160a9f65c9 100644 --- a/content/engine/reference/commandline/container_exec.md +++ b/content/engine/reference/commandline/container_exec.md @@ -4,6 +4,7 @@ datafile: docker_container_exec title: docker container exec aliases: - /edge/engine/reference/commandline/container_exec/ +- /engine/reference/commandline/exec/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_export.md b/content/engine/reference/commandline/container_export.md index f375ab873f..874c090072 100644 --- a/content/engine/reference/commandline/container_export.md +++ b/content/engine/reference/commandline/container_export.md @@ -4,6 +4,7 @@ datafile: docker_container_export title: docker container export aliases: - /edge/engine/reference/commandline/container_export/ +- /engine/reference/commandline/export/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_kill.md b/content/engine/reference/commandline/container_kill.md index 3087bdb895..e1cd73c8fd 100644 --- a/content/engine/reference/commandline/container_kill.md +++ b/content/engine/reference/commandline/container_kill.md @@ -4,6 +4,7 @@ datafile: docker_container_kill title: docker container kill aliases: - /edge/engine/reference/commandline/container_kill/ +- /engine/reference/commandline/kill/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_logs.md b/content/engine/reference/commandline/container_logs.md index d1e7828357..577273f09a 100644 --- a/content/engine/reference/commandline/container_logs.md +++ b/content/engine/reference/commandline/container_logs.md @@ -4,6 +4,7 @@ datafile: docker_container_logs title: docker container logs aliases: - /edge/engine/reference/commandline/container_logs/ +- /engine/reference/commandline/logs/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_ls.md b/content/engine/reference/commandline/container_ls.md index b95d003b48..0ec1c74cd3 100644 --- a/content/engine/reference/commandline/container_ls.md +++ b/content/engine/reference/commandline/container_ls.md @@ -4,6 +4,7 @@ datafile: docker_container_ls title: docker container ls aliases: - /edge/engine/reference/commandline/container_ls/ +- /engine/reference/commandline/ps/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_pause.md b/content/engine/reference/commandline/container_pause.md index 7bda777ddc..a0f997e922 100644 --- a/content/engine/reference/commandline/container_pause.md +++ b/content/engine/reference/commandline/container_pause.md @@ -4,6 +4,7 @@ datafile: docker_container_pause title: docker container pause aliases: - /edge/engine/reference/commandline/container_pause/ +- /engine/reference/commandline/pause/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_port.md b/content/engine/reference/commandline/container_port.md index a5f163858a..a1dd29b26d 100644 --- a/content/engine/reference/commandline/container_port.md +++ b/content/engine/reference/commandline/container_port.md @@ -4,6 +4,7 @@ datafile: docker_container_port title: docker container port aliases: - /edge/engine/reference/commandline/container_port/ +- /engine/reference/commandline/port/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_rename.md b/content/engine/reference/commandline/container_rename.md index 595c5fdf91..9b724095b2 100644 --- a/content/engine/reference/commandline/container_rename.md +++ b/content/engine/reference/commandline/container_rename.md @@ -4,6 +4,7 @@ datafile: docker_container_rename title: docker container rename aliases: - /edge/engine/reference/commandline/container_rename/ +- /engine/reference/commandline/rename/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_restart.md b/content/engine/reference/commandline/container_restart.md index af3d44c6a9..ff2888b41f 100644 --- a/content/engine/reference/commandline/container_restart.md +++ b/content/engine/reference/commandline/container_restart.md @@ -4,6 +4,7 @@ datafile: docker_container_restart title: docker container restart aliases: - /edge/engine/reference/commandline/container_restart/ +- /engine/reference/commandline/restart/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_rm.md b/content/engine/reference/commandline/container_rm.md index fad62d8922..e9b5b968e7 100644 --- a/content/engine/reference/commandline/container_rm.md +++ b/content/engine/reference/commandline/container_rm.md @@ -4,6 +4,7 @@ datafile: docker_container_rm title: docker container rm aliases: - /edge/engine/reference/commandline/container_rm/ +- /engine/reference/commandline/rm/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_run.md b/content/engine/reference/commandline/container_run.md index 7ee1d5bf0d..cee6f729e6 100644 --- a/content/engine/reference/commandline/container_run.md +++ b/content/engine/reference/commandline/container_run.md @@ -4,6 +4,7 @@ datafile: docker_container_run title: docker container run aliases: - /edge/engine/reference/commandline/container_rm/ +- /engine/reference/commandline/run/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_start.md b/content/engine/reference/commandline/container_start.md index 42a98a8235..c9155b0fb9 100644 --- a/content/engine/reference/commandline/container_start.md +++ b/content/engine/reference/commandline/container_start.md @@ -4,6 +4,7 @@ datafile: docker_container_start title: docker container start aliases: - /edge/engine/reference/commandline/container_start/ +- /engine/reference/commandline/start/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_stats.md b/content/engine/reference/commandline/container_stats.md index e59197cce9..7e81bcaefc 100644 --- a/content/engine/reference/commandline/container_stats.md +++ b/content/engine/reference/commandline/container_stats.md @@ -4,6 +4,7 @@ datafile: docker_container_stats title: docker container stats aliases: - /edge/engine/reference/commandline/container_stats/ +- /engine/reference/commandline/stats/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_stop.md b/content/engine/reference/commandline/container_stop.md index b14eb64067..1f6aca6631 100644 --- a/content/engine/reference/commandline/container_stop.md +++ b/content/engine/reference/commandline/container_stop.md @@ -4,6 +4,7 @@ datafile: docker_container_stop title: docker container stop aliases: - /edge/engine/reference/commandline/container_stop/ +- /engine/reference/commandline/stop/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_top.md b/content/engine/reference/commandline/container_top.md index 6fc216518c..5e2bbea955 100644 --- a/content/engine/reference/commandline/container_top.md +++ b/content/engine/reference/commandline/container_top.md @@ -4,6 +4,7 @@ datafile: docker_container_top title: docker container top aliases: - /edge/engine/reference/commandline/container_top/ +- /engine/reference/commandline/top/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_unpause.md b/content/engine/reference/commandline/container_unpause.md index 7b050663b4..cd6352fd7d 100644 --- a/content/engine/reference/commandline/container_unpause.md +++ b/content/engine/reference/commandline/container_unpause.md @@ -4,6 +4,7 @@ datafile: docker_container_unpause title: docker container unpause aliases: - /edge/engine/reference/commandline/container_unpause/ +- /engine/reference/commandline/unpause/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_update.md b/content/engine/reference/commandline/container_update.md index 29f2cc4819..f968d108bf 100644 --- a/content/engine/reference/commandline/container_update.md +++ b/content/engine/reference/commandline/container_update.md @@ -4,6 +4,7 @@ datafile: docker_container_update title: docker container update aliases: - /edge/engine/reference/commandline/container_update/ +- /engine/reference/commandline/update/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/container_wait.md b/content/engine/reference/commandline/container_wait.md index 760cdfa704..bb7f234ad8 100644 --- a/content/engine/reference/commandline/container_wait.md +++ b/content/engine/reference/commandline/container_wait.md @@ -4,6 +4,7 @@ datafile: docker_container_wait title: docker container wait aliases: - /edge/engine/reference/commandline/container_wait/ +- /engine/reference/commandline/wait/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/cp.md b/content/engine/reference/commandline/cp.md deleted file mode 100644 index cc24a93390..0000000000 --- a/content/engine/reference/commandline/cp.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_cp -title: docker cp -aliases: -- /edge/engine/reference/commandline/cp/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/create.md b/content/engine/reference/commandline/create.md deleted file mode 100644 index 05134539f8..0000000000 --- a/content/engine/reference/commandline/create.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_create -title: docker create -aliases: -- /edge/engine/reference/commandline/create/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/diff.md b/content/engine/reference/commandline/diff.md deleted file mode 100644 index a3d8caffbf..0000000000 --- a/content/engine/reference/commandline/diff.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_diff -title: docker diff -aliases: -- /edge/engine/reference/commandline/diff/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/events.md b/content/engine/reference/commandline/events.md deleted file mode 100644 index 87cee646b6..0000000000 --- a/content/engine/reference/commandline/events.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_events -title: docker events -aliases: -- /edge/engine/reference/commandline/events/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/exec.md b/content/engine/reference/commandline/exec.md deleted file mode 100644 index 6467d4d677..0000000000 --- a/content/engine/reference/commandline/exec.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_exec -title: docker exec -aliases: -- /edge/engine/reference/commandline/exec/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/export.md b/content/engine/reference/commandline/export.md deleted file mode 100644 index 0311afa1f0..0000000000 --- a/content/engine/reference/commandline/export.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_export -title: docker export -aliases: -- /edge/engine/reference/commandline/export/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/history.md b/content/engine/reference/commandline/history.md deleted file mode 100644 index ead222e929..0000000000 --- a/content/engine/reference/commandline/history.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_history -title: docker history -aliases: -- /edge/engine/reference/commandline/history/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/image_build.md b/content/engine/reference/commandline/image_build.md index b0931baef4..2c798621e4 100644 --- a/content/engine/reference/commandline/image_build.md +++ b/content/engine/reference/commandline/image_build.md @@ -4,6 +4,8 @@ datafile: docker_image_build title: docker image build aliases: - /edge/engine/reference/commandline/image_build/ +- /engine/reference/commandline/build/ +- /engine/reference/commandline/builder_build/ layout: cli --- @@ -13,4 +15,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_history.md b/content/engine/reference/commandline/image_history.md index 8005a3e062..cbdc8a0056 100644 --- a/content/engine/reference/commandline/image_history.md +++ b/content/engine/reference/commandline/image_history.md @@ -4,6 +4,7 @@ datafile: docker_image_history title: docker image history aliases: - /edge/engine/reference/commandline/image_history/ +- /engine/reference/commandline/history/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_import.md b/content/engine/reference/commandline/image_import.md index 4675b4dbee..cc5fc4cefe 100644 --- a/content/engine/reference/commandline/image_import.md +++ b/content/engine/reference/commandline/image_import.md @@ -4,6 +4,7 @@ datafile: docker_image_import title: docker image import aliases: - /edge/engine/reference/commandline/image_import/ +- /engine/reference/commandline/import/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_load.md b/content/engine/reference/commandline/image_load.md index 116c20a476..df77686c36 100644 --- a/content/engine/reference/commandline/image_load.md +++ b/content/engine/reference/commandline/image_load.md @@ -4,6 +4,7 @@ datafile: docker_image_load title: docker image load aliases: - /edge/engine/reference/commandline/image_load/ +- /engine/reference/commandline/load/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_ls.md b/content/engine/reference/commandline/image_ls.md index 8a32a287c9..50668e18a8 100644 --- a/content/engine/reference/commandline/image_ls.md +++ b/content/engine/reference/commandline/image_ls.md @@ -4,6 +4,7 @@ datafile: docker_image_ls title: docker image ls aliases: - /edge/engine/reference/commandline/image_ls/ +- /engine/reference/commandline/images/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_pull.md b/content/engine/reference/commandline/image_pull.md index 23b0988d2f..f546aa2267 100644 --- a/content/engine/reference/commandline/image_pull.md +++ b/content/engine/reference/commandline/image_pull.md @@ -4,6 +4,7 @@ datafile: docker_image_pull title: docker image pull aliases: - /edge/engine/reference/commandline/image_pull/ +- /engine/reference/commandline/pull/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_push.md b/content/engine/reference/commandline/image_push.md index a7a3045a7a..7838f6365e 100644 --- a/content/engine/reference/commandline/image_push.md +++ b/content/engine/reference/commandline/image_push.md @@ -4,6 +4,7 @@ datafile: docker_image_push title: docker image push aliases: - /edge/engine/reference/commandline/image_push/ +- /engine/reference/commandline/push/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_rm.md b/content/engine/reference/commandline/image_rm.md index 3117c9c4bb..758d8631e4 100644 --- a/content/engine/reference/commandline/image_rm.md +++ b/content/engine/reference/commandline/image_rm.md @@ -4,6 +4,7 @@ datafile: docker_image_rm title: docker image rm aliases: - /edge/engine/reference/commandline/image_rm/ +- /engine/reference/commandline/rmi/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_save.md b/content/engine/reference/commandline/image_save.md index 9ea22d161a..fe37e0664e 100644 --- a/content/engine/reference/commandline/image_save.md +++ b/content/engine/reference/commandline/image_save.md @@ -4,6 +4,7 @@ datafile: docker_image_save title: docker image save aliases: - /edge/engine/reference/commandline/image_save/ +- /engine/reference/commandline/save/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/image_tag.md b/content/engine/reference/commandline/image_tag.md index f5a6a6a4f6..a3c2226344 100644 --- a/content/engine/reference/commandline/image_tag.md +++ b/content/engine/reference/commandline/image_tag.md @@ -4,6 +4,7 @@ datafile: docker_image_tag title: docker image tag aliases: - /edge/engine/reference/commandline/image_tag/ +- /engine/reference/commandline/tag/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/images.md b/content/engine/reference/commandline/images.md deleted file mode 100644 index 87afebbf08..0000000000 --- a/content/engine/reference/commandline/images.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_images -title: docker images -aliases: -- /edge/engine/reference/commandline/images/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/import.md b/content/engine/reference/commandline/import.md deleted file mode 100644 index f60eef87e0..0000000000 --- a/content/engine/reference/commandline/import.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_import -title: docker import -aliases: -- /edge/engine/reference/commandline/import/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/info.md b/content/engine/reference/commandline/info.md deleted file mode 100644 index ea2fc28fa0..0000000000 --- a/content/engine/reference/commandline/info.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_info -title: docker info -aliases: -- /edge/engine/reference/commandline/info/ -layout: cli ---- - - - - -## Warnings about kernel support - -If your operating system does not enable certain capabilities, you may see -warnings such as one of the following, when you run `docker info`: - -```none -WARNING: Your kernel does not support swap limit capabilities. Limitation discarded. -``` - -```none -WARNING: No swap limit support -``` - -You can ignore these warnings unless you actually need the ability to -[limit these resources](../../../config/containers/resource_constraints.md), in which case you -should consult your operating system's documentation for enabling them. \ No newline at end of file diff --git a/content/engine/reference/commandline/kill.md b/content/engine/reference/commandline/kill.md deleted file mode 100644 index a25c02aa37..0000000000 --- a/content/engine/reference/commandline/kill.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_kill -title: docker kill -aliases: -- /edge/engine/reference/commandline/kill/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/load.md b/content/engine/reference/commandline/load.md deleted file mode 100644 index 1416f6f70d..0000000000 --- a/content/engine/reference/commandline/load.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_load -title: docker load -aliases: -- /edge/engine/reference/commandline/load/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/logs.md b/content/engine/reference/commandline/logs.md deleted file mode 100644 index 977d637b16..0000000000 --- a/content/engine/reference/commandline/logs.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_logs -title: docker logs -aliases: -- /edge/engine/reference/commandline/logs/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/pause.md b/content/engine/reference/commandline/pause.md deleted file mode 100644 index cb9634c94a..0000000000 --- a/content/engine/reference/commandline/pause.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_pause -title: docker pause -aliases: -- /edge/engine/reference/commandline/pause/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/port.md b/content/engine/reference/commandline/port.md deleted file mode 100644 index c80015207e..0000000000 --- a/content/engine/reference/commandline/port.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_port -title: docker port -aliases: -- /edge/engine/reference/commandline/port/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/ps.md b/content/engine/reference/commandline/ps.md deleted file mode 100644 index 4487095507..0000000000 --- a/content/engine/reference/commandline/ps.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_ps -title: docker ps -aliases: -- /edge/engine/reference/commandline/ps/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/pull.md b/content/engine/reference/commandline/pull.md deleted file mode 100644 index 8e85769af4..0000000000 --- a/content/engine/reference/commandline/pull.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_pull -title: docker pull -aliases: -- /edge/engine/reference/commandline/pull/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/push.md b/content/engine/reference/commandline/push.md deleted file mode 100644 index 1d61e207f6..0000000000 --- a/content/engine/reference/commandline/push.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_push -title: docker push -aliases: -- /edge/engine/reference/commandline/push/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/rename.md b/content/engine/reference/commandline/rename.md deleted file mode 100644 index 833f93ba11..0000000000 --- a/content/engine/reference/commandline/rename.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_rename -title: docker rename -aliases: -- /edge/engine/reference/commandline/rename/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/restart.md b/content/engine/reference/commandline/restart.md deleted file mode 100644 index 5f5e7fa2f9..0000000000 --- a/content/engine/reference/commandline/restart.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_restart -title: docker restart -aliases: -- /edge/engine/reference/commandline/restart/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/rm.md b/content/engine/reference/commandline/rm.md deleted file mode 100644 index f67112d52f..0000000000 --- a/content/engine/reference/commandline/rm.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_rm -title: docker rm -aliases: -- /edge/engine/reference/commandline/rm/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/rmi.md b/content/engine/reference/commandline/rmi.md deleted file mode 100644 index 6f00403d73..0000000000 --- a/content/engine/reference/commandline/rmi.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_rmi -title: docker rmi -aliases: -- /edge/engine/reference/commandline/rmi/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/run.md b/content/engine/reference/commandline/run.md deleted file mode 100644 index c8b611c38b..0000000000 --- a/content/engine/reference/commandline/run.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_run -title: docker run -description: Learn all there is to know about the docker run command and how to use - it in the Docker CLI. -aliases: -- /reference/run/ -- /edge/engine/reference/commandline/run/ -- /reference/commandline/run/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/save.md b/content/engine/reference/commandline/save.md deleted file mode 100644 index 97c3460ef8..0000000000 --- a/content/engine/reference/commandline/save.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_save -title: docker save -aliases: -- /edge/engine/reference/commandline/save/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/start.md b/content/engine/reference/commandline/start.md deleted file mode 100644 index 2d74b1c6c6..0000000000 --- a/content/engine/reference/commandline/start.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_start -title: docker start -aliases: -- /edge/engine/reference/commandline/start/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/stats.md b/content/engine/reference/commandline/stats.md deleted file mode 100644 index a88c28cf16..0000000000 --- a/content/engine/reference/commandline/stats.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_stats -title: docker stats -aliases: -- /edge/engine/reference/commandline/stats/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/stop.md b/content/engine/reference/commandline/stop.md deleted file mode 100644 index 64179894d8..0000000000 --- a/content/engine/reference/commandline/stop.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_stop -title: docker stop -aliases: -- /edge/engine/reference/commandline/stop/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/system_events.md b/content/engine/reference/commandline/system_events.md index a82c5c8116..68025aadf1 100644 --- a/content/engine/reference/commandline/system_events.md +++ b/content/engine/reference/commandline/system_events.md @@ -4,6 +4,7 @@ datafile: docker_system_events title: docker system events aliases: - /edge/engine/reference/commandline/system_events/ +- /engine/reference/commandline/events/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/system_info.md b/content/engine/reference/commandline/system_info.md index 69bf76d902..d79767e352 100644 --- a/content/engine/reference/commandline/system_info.md +++ b/content/engine/reference/commandline/system_info.md @@ -4,6 +4,7 @@ datafile: docker_system_info title: docker system info aliases: - /edge/engine/reference/commandline/system_info/ +- /engine/reference/commandline/info/ layout: cli --- @@ -13,4 +14,4 @@ suggest a change to the text that appears here, open a ticket or pull request in the source repository on GitHub: https://github.com/docker/cli ---> \ No newline at end of file +--> diff --git a/content/engine/reference/commandline/tag.md b/content/engine/reference/commandline/tag.md deleted file mode 100644 index dbb6b0fe2d..0000000000 --- a/content/engine/reference/commandline/tag.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_tag -title: docker tag -aliases: -- /edge/engine/reference/commandline/tag/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/top.md b/content/engine/reference/commandline/top.md deleted file mode 100644 index 5c7565c86b..0000000000 --- a/content/engine/reference/commandline/top.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_top -title: docker top -aliases: -- /edge/engine/reference/commandline/top/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/unpause.md b/content/engine/reference/commandline/unpause.md deleted file mode 100644 index 62e70dc739..0000000000 --- a/content/engine/reference/commandline/unpause.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_unpause -title: docker unpause -aliases: -- /edge/engine/reference/commandline/unpause/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/update.md b/content/engine/reference/commandline/update.md deleted file mode 100644 index 2c8a714493..0000000000 --- a/content/engine/reference/commandline/update.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_update -title: docker update -aliases: -- /edge/engine/reference/commandline/update/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/engine/reference/commandline/wait.md b/content/engine/reference/commandline/wait.md deleted file mode 100644 index 9ac4b23d45..0000000000 --- a/content/engine/reference/commandline/wait.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -datafolder: engine-cli -datafile: docker_wait -title: docker wait -aliases: -- /edge/engine/reference/commandline/wait/ -layout: cli ---- - - \ No newline at end of file diff --git a/content/guides/walkthroughs/access-local-folder.md b/content/guides/walkthroughs/access-local-folder.md index 00b5ba0b07..52a810bdbc 100644 --- a/content/guides/walkthroughs/access-local-folder.md +++ b/content/guides/walkthroughs/access-local-folder.md @@ -82,7 +82,7 @@ Related information: - Deep dive into [bind mounts](../../storage/bind-mounts.md) - Learn about using bind mounts in Compose in the [Compose file reference](../../compose/compose-file/_index.md) -- Explore using bind mounts via the CLI in the [Docker run reference](/engine/reference/run/#volume-shared-filesystems) +- Explore using bind mounts via the CLI in the [Docker run reference](/engine/reference/commandline/container_run/#mount) ## Next steps diff --git a/content/guides/walkthroughs/publish-your-image.md b/content/guides/walkthroughs/publish-your-image.md index 644c309d1b..3de04dc7c0 100644 --- a/content/guides/walkthroughs/publish-your-image.md +++ b/content/guides/walkthroughs/publish-your-image.md @@ -55,7 +55,7 @@ In this walkthrough, you pushed and shared an image on Docker Hub. Related information: - Deep dive into the [Docker Hub manual](../../docker-hub/_index.md) -- Learn more about the [docker tag](../../engine/reference/commandline/tag.md) +- Learn more about the [docker tag](../../engine/reference/commandline/image_tag.md) command ## Next steps @@ -68,4 +68,4 @@ Continue to the language-specific guides to learn how you can use Docker to cont - [Node.js](../../language/nodejs/_index.md) - [PHP](../../language/php/_index.md) - [Python](../../language/python/_index.md) -- [Rust](../../language/rust/_index.md) \ No newline at end of file +- [Rust](../../language/rust/_index.md) diff --git a/content/language/rust/build-images.md b/content/language/rust/build-images.md index da6068784c..6d646d5456 100644 --- a/content/language/rust/build-images.md +++ b/content/language/rust/build-images.md @@ -174,7 +174,7 @@ Related information: - [Dockerfile reference](../../engine/reference/builder.md) - [.dockerignore file](../../engine/reference/builder.md#dockerignore-file) - [docker init CLI reference](../../engine/reference/commandline/init.md) - - [docker build CLI reference](../../engine/reference/commandline/build.md) + - [docker build CLI reference](../../engine/reference/commandline/image_build.md) ## Next steps diff --git a/content/language/rust/run-containers.md b/content/language/rust/run-containers.md index a45b390ef7..285cf98698 100644 --- a/content/language/rust/run-containers.md +++ b/content/language/rust/run-containers.md @@ -192,7 +192,7 @@ That’s better! You can now easily identify your container based on the name. In this section, you took a look at running containers. You also took a look at managing containers by starting, stopping, and restarting them. And finally, you looked at naming your containers so they are more easily identifiable. Related information: - - [docker run CLI reference](../../engine/reference/commandline/run.md) + - [docker run CLI reference](../../engine/reference/commandline/container_run.md) ## Next steps diff --git a/content/network/_index.md b/content/network/_index.md index a1bbcf7753..2af35ddd79 100644 --- a/content/network/_index.md +++ b/content/network/_index.md @@ -195,7 +195,7 @@ Your container will have lines in `/etc/hosts` which define the hostname of the container itself, as well as `localhost` and a few other common things. Custom hosts, defined in `/etc/hosts` on the host machine, aren't inherited by containers. To pass additional hosts into container, refer to [add entries to -container hosts file](../engine/reference/commandline/run.md#add-host) in the +container hosts file](../engine/reference/commandline/container_run.md#add-host) in the `docker run` reference documentation. ## Proxy server diff --git a/content/network/network-tutorial-overlay.md b/content/network/network-tutorial-overlay.md index a139dc9027..0e83f3b5d3 100644 --- a/content/network/network-tutorial-overlay.md +++ b/content/network/network-tutorial-overlay.md @@ -402,7 +402,7 @@ example also uses Linux hosts, but the same commands work on Windows. The two containers communicate with the overlay network connecting the two hosts. If you run another alpine container on `host2` that is _not detached_, you can ping `alpine1` from `host2` (and here we add the - [remove option](/engine/reference/run/#clean-up---rm) for automatic container cleanup): + [remove option](/engine/reference/commandline/container_run/#rm) for automatic container cleanup): ```sh $ docker run -it --rm --name alpine3 --network test-net alpine @@ -642,4 +642,4 @@ learn about user-defined bridge networks, continue to the - [Host networking tutorial](network-tutorial-host.md) - [Standalone networking tutorial](network-tutorial-standalone.md) -- [Macvlan networking tutorial](network-tutorial-macvlan.md) \ No newline at end of file +- [Macvlan networking tutorial](network-tutorial-macvlan.md) diff --git a/data/toc.yaml b/data/toc.yaml index 2f42c0fab8..8718cb2ad4 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -275,8 +275,6 @@ Reference: section: - path: /engine/reference/commandline/docker/ title: docker (base command) - - path: /engine/reference/commandline/attach/ - title: docker attach - path: /engine/reference/commandline/build/ title: docker build - sectiontitle: docker builder @@ -333,8 +331,6 @@ Reference: title: docker checkpoint ls - path: /engine/reference/commandline/checkpoint_rm/ title: docker checkpoint rm - - path: /engine/reference/commandline/commit/ - title: docker commit - sectiontitle: docker compose section: - path: /compose/reference/ @@ -495,20 +491,8 @@ Reference: title: docker context update - path: /engine/reference/commandline/context_use/ title: docker context use - - path: /engine/reference/commandline/cp/ - title: docker cp - - path: /engine/reference/commandline/create/ - title: docker create - - path: /engine/reference/commandline/diff/ - title: docker diff - - path: /engine/reference/commandline/events/ - title: docker events - path: /engine/reference/commandline/exec/ title: docker exec - - path: /engine/reference/commandline/export/ - title: docker export - - path: /engine/reference/commandline/history/ - title: docker history - sectiontitle: docker image section: - path: /engine/reference/commandline/image/ @@ -539,24 +523,16 @@ Reference: title: docker image tag - path: /engine/reference/commandline/images/ title: docker images - - path: /engine/reference/commandline/import/ - title: docker import - path: /engine/reference/commandline/info/ title: docker info - path: /engine/reference/commandline/init/ title: docker init (Beta) - path: /engine/reference/commandline/inspect/ title: docker inspect - - path: /engine/reference/commandline/kill/ - title: docker kill - - path: /engine/reference/commandline/load/ - title: docker load - path: /engine/reference/commandline/login/ title: docker login - path: /engine/reference/commandline/logout/ title: docker logout - - path: /engine/reference/commandline/logs/ - title: docker logs - sectiontitle: docker manifest section: - path: /engine/reference/commandline/manifest/ @@ -607,8 +583,6 @@ Reference: title: docker node rm - path: /engine/reference/commandline/node_update/ title: docker node update - - path: /engine/reference/commandline/pause/ - title: docker pause - sectiontitle: docker plugin section: - path: /engine/reference/commandline/plugin/ @@ -631,26 +605,14 @@ Reference: title: docker plugin set - path: /engine/reference/commandline/plugin_upgrade/ title: docker plugin upgrade - - path: /engine/reference/commandline/port/ - title: docker port - path: /engine/reference/commandline/ps/ title: docker ps - path: /engine/reference/commandline/pull/ title: docker pull - path: /engine/reference/commandline/push/ title: docker push - - path: /engine/reference/commandline/rename/ - title: docker rename - - path: /engine/reference/commandline/restart/ - title: docker restart - - path: /engine/reference/commandline/rm/ - title: docker rm - - path: /engine/reference/commandline/rmi/ - title: docker rmi - path: /engine/reference/commandline/run/ title: docker run - - path: /engine/reference/commandline/save/ - title: docker save - sectiontitle: docker scout section: - path: /engine/reference/commandline/scout/ @@ -753,12 +715,6 @@ Reference: title: docker stack rm - path: /engine/reference/commandline/stack_services/ title: docker stack services - - path: /engine/reference/commandline/start/ - title: docker start - - path: /engine/reference/commandline/stats/ - title: docker stats - - path: /engine/reference/commandline/stop/ - title: docker stop - sectiontitle: docker swarm section: - path: /engine/reference/commandline/swarm/ @@ -791,10 +747,6 @@ Reference: title: docker system info - path: /engine/reference/commandline/system_prune/ title: docker system prune - - path: /engine/reference/commandline/tag/ - title: docker tag - - path: /engine/reference/commandline/top/ - title: docker top - sectiontitle: docker trust section: - path: /engine/reference/commandline/trust/ @@ -817,10 +769,6 @@ Reference: title: docker trust signer add - path: /engine/reference/commandline/trust_signer_remove/ title: docker trust signer remove - - path: /engine/reference/commandline/unpause/ - title: docker unpause - - path: /engine/reference/commandline/update/ - title: docker update - path: /engine/reference/commandline/version/ title: docker version - sectiontitle: docker volume @@ -837,8 +785,6 @@ Reference: title: docker volume rm - path: /engine/reference/commandline/volume_update/ title: docker volume update - - path: /engine/reference/commandline/wait/ - title: docker wait - title: Dockerfile reference path: /engine/reference/builder/ - title: Daemon CLI (dockerd)