diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3306ff5e8a..2bc191cfe1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,7 +55,7 @@ your work on that project's `vnext` branch.** These branches were created by cloning `master` and then importing a project's `master` branch's docs into it (at the time of the migration), in a way that preserved the commit history. When a project has a release, its `vnext` branch will be merged into `master` and your -work will be visible on docs.docker.com. +work will be visible on [https://docs.docker.com/](/). The following `vnext` branches currently exist: @@ -122,7 +122,7 @@ know. ## Style guide If you have questions about how to write for Docker's documentation, have a look -at the [style guide](https://docs.docker.com/opensource/doc-style/). The style +at the [style guide](/opensource/doc-style/). The style guide provides guidance about grammar, syntax, formatting, styling, language, or tone. If something isn't clear in the guide, submit an issue to let us know or submit a pull request to help us improve it. diff --git a/README.md b/README.md index 75d8232079..5228c6660c 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ help. If a reviewer realizes you have based your work on the wrong branch, we'll let you know so that you can rebase it. >**Note**: To contribute code to Docker projects, see the -[Contribution guidelines](https://docs.docker.com/opensource/project/who-written-for/). +[Contribution guidelines](/opensource/project/who-written-for/). ### Files not edited here @@ -117,7 +117,7 @@ You have three options: ``` If you haven't got Docker Compose installed, - [follow these installation instructions](https://docs.docker.com/compose/install/). + [follow these installation instructions](/compose/install/). The container runs in the background and incrementally rebuilds the site each time a file changes. You can keep your browser open to http://localhost:4000/ @@ -250,7 +250,7 @@ no_ratings: true ### Creating tabs -The use of tabs, as on pages like https://docs.docker.com/engine/api/, requires +The use of tabs, as on pages like [https://docs.docker.com/engine/api/](/engine/api/), requires the use of HTML. The tabs use Bootstrap CSS/JS, so refer to those docs for more advanced usage. For a basic horizontal tab set, copy/paste starting from this code and implement from there. Keep an eye on those `href="#id"` and `id="id"` @@ -292,7 +292,7 @@ images, see the [README in the publish-tools branch](https://github.com/docker/d - The `master` branch has a Dockerfile which uses the static HTML from each archive image, in combination with the Markdown files in `master` and some upstream resources which are fetched at build-time, - to create the full site at https://docs.docker.com/. All + to create the full site at [https://docs.docker.com/](/). All of the long-running branches, such as `vnext-engine`, `vnext-compose`, etc, use the same logic. diff --git a/_data/redirects.csv b/_data/redirects.csv index 8610794fdf..e7120f63cd 100644 --- a/_data/redirects.csv +++ b/_data/redirects.csv @@ -8,7 +8,7 @@ source,destination /articles/,/engine/articles/ /examples/,/engine/examples/ /extend/,/engine/extend/ -/installation/,/engine/installation/ +/installation/,/install/ /introduction/,/engine/introduction/ /misc/,/engine/misc/ /project/,/opensource/project/ @@ -16,7 +16,7 @@ source,destination /security/,/engine/security/ /static_files/,/engine/static_files/ /userguide/,/engine/userguide/ -/en/latest/installation/,/engine/installation/ +/en/latest/installation/,/install/ /docker-hub-enterprise/install/,/docker-trusted-registry/install/ /docker-io/builds/,/docker-hub/builds/ /docker-trusted-registry/license/install-csengine.md,/docker-trusted-registry/install/install-csengine/ @@ -24,7 +24,7 @@ source,destination /engine/project/set-up-git/,/opensource/project/set-up-git/ /engine/reference/articles/basics.md,/engine/userguide/basics/ /engine/userguide/dockerlinks/,/engine/userguide/networking/default_network/dockerlinks/ -/installation/,/engine/installation/ +/installation/,/install/ /networking/,/engine/userguide/networking/ /opensource/project/advanced-contributing/,/opensource/workflow/advanced-contributing/ /opensource/project/create-pr/,/opensource/workflow/create-pr/ diff --git a/_data/toc.yaml b/_data/toc.yaml index 9e691797ba..04bf321491 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -18,21 +18,21 @@ horizontalnav: guides: - sectiontitle: Get Docker section: - - path: /engine/installation/ + - path: /install/ title: Install Docker - sectiontitle: Docker EE section: - - path: /engine/installation/windows/docker-ee/ + - path: /install/windows/docker-ee/ title: Windows Server - - path: /engine/installation/linux/docker-ee/ubuntu/ + - path: /install/linux/docker-ee/ubuntu/ title: Ubuntu - - path: /engine/installation/linux/docker-ee/rhel/ + - path: /install/linux/docker-ee/rhel/ title: RHEL - - path: /engine/installation/linux/docker-ee/centos/ + - path: /install/linux/docker-ee/centos/ title: CentOS - - path: /engine/installation/linux/docker-ee/oracle/ + - path: /install/linux/docker-ee/oracle/ title: Oracle Linux - - path: /engine/installation/linux/docker-ee/suse/ + - path: /install/linux/docker-ee/suse/ title: SLES - sectiontitle: Docker CE section: @@ -40,23 +40,23 @@ guides: title: Mac - path: /docker-for-windows/install/ title: Windows - - path: /engine/installation/linux/docker-ce/ubuntu/ + - path: /install/linux/docker-ce/ubuntu/ title: Ubuntu - - path: /engine/installation/linux/docker-ce/debian/ + - path: /install/linux/docker-ce/debian/ title: Debian - - path: /engine/installation/linux/docker-ce/centos/ + - path: /install/linux/docker-ce/centos/ title: CentOS - - path: /engine/installation/linux/docker-ce/fedora/ + - path: /install/linux/docker-ce/fedora/ title: Fedora - - path: /engine/installation/linux/docker-ce/binaries/ + - path: /install/linux/docker-ce/binaries/ title: Binaries - sectiontitle: Platforms supporting Docker EE and Docker CE section: - - path: /engine/installation/linux/centos/ + - path: /install/linux/centos/ title: CentOS - - path: /engine/installation/linux/ubuntu/ + - path: /install/linux/ubuntu/ title: Ubuntu - - path: /engine/installation/linux/linux-postinstall/ + - path: /install/linux/linux-postinstall/ title: Optional Linux post-installation steps - sectiontitle: Docker Edge section: @@ -1446,7 +1446,7 @@ manuals: section: - path: /enterprise/ title: About Docker EE - - path: /engine/installation/ + - path: /install/ title: Install Docker EE nosync: true - title: Try Docker EE (no install) diff --git a/_includes/docker_ce_ee.md b/_includes/docker_ce_ee.md index 194b03c218..a70e3da450 100644 --- a/_includes/docker_ce_ee.md +++ b/_includes/docker_ce_ee.md @@ -1,4 +1,4 @@ -{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} +{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} | Capabilities | Community Edition | Enterprise Edition Basic | Enterprise Edition Standard | Enterprise Edition Advanced | |:------------------------------------------------------------------|:------------------|:-------------------------|:----------------------------|:----------------------------| diff --git a/_includes/docker_cloud_matrix.md b/_includes/docker_cloud_matrix.md index f4cefef08c..ad93f84b22 100644 --- a/_includes/docker_cloud_matrix.md +++ b/_includes/docker_cloud_matrix.md @@ -1,6 +1,7 @@ -{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} -{% assign install-prefix = '/engine/installation/linux' %} +{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} +{% assign install-prefix = '/install/linux' %} | Platform | Docker CE x86_64 | Docker CE ARM | Docker EE | |:----------------------------------------------------------------------|:-------------------------------------------------------------|:--------------------------------------------------------------|:-------------------------------------------------------------| | [Amazon Web Services](/docker-for-aws/) | [{{ green-check }}](/docker-for-aws/) | | [{{ green-check }}](/docker-for-aws/) | | [Microsoft Azure](/docker-for-azure/) | [{{ green-check }}](/docker-for-azure/) | | [{{ green-check }}](/docker-for-azure/) | +| [IBM Cloud (Beta)](/docker-for-ibm-cloud/) | | | [{{ green-check }}](/docker-for-ibm-cloud/) | \ No newline at end of file diff --git a/_includes/docker_desktop_matrix.md b/_includes/docker_desktop_matrix.md index 055fd0c936..b53504ca74 100644 --- a/_includes/docker_desktop_matrix.md +++ b/_includes/docker_desktop_matrix.md @@ -1,5 +1,5 @@ -{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} -{% assign install-prefix = '/engine/installation/linux' %} +{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} +{% assign install-prefix = '/install/linux' %} | Platform | Docker CE x86_64 | Docker CE ARM | Docker EE | |:----------------------------------------------------------------------|:-------------------------------------------------------------|:--------------------------------------------------------------|:-------------------------------------------------------------| | [Docker for Mac (macOS)](/docker-for-mac/install.md) | [{{ green-check }}](/docker-for-mac/install.md) | diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md index 8e44aa3970..4bb200fac4 100644 --- a/_includes/docker_platform_matrix.md +++ b/_includes/docker_platform_matrix.md @@ -1,16 +1,15 @@ -{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} -{% assign install-prefix = '/engine/installation/linux' %} - -| Platform | Docker CE x86_64 | Docker CE ARM | Docker CE ARM64 | Docker CE IBM Z (s390x) | Docker EE x86_64 | Docker EE IBM Z (s390x) | -|:---------------------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:---------------------------------------------------------------|:--------------------------------------------------------------| -| [CentOS]({{ install-prefix }}/centos/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos/) | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/centos/) | | -| [Debian]({{ install-prefix }}/docker-ce/debian/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian/) | | | | -| [Fedora]({{ install-prefix }}/docker-ce/fedora/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora/) | | | | | | -| [Microsoft Windows Server 2016](/engine/installation/windows/docker-ee/) | | | | | [{{ green-check }}](/engine/installation/windows/docker-ee/) | | -| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle/) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle/) | | -| [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel/) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel/) | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel/) | -| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse/) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse/) | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse/) | -| [Ubuntu]({{ install-prefix }}/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu/) | +{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} +{% assign install-prefix = '/install/linux' %} +| Platform | Docker CE x86_64 | Docker CE ARM | Docker CE IBM Power (ppc64le) | Docker CE IBM Z (s390x) | Docker EE x86_64 | Docker EE IBM Power (ppc64le) | Docker EE IBM Z (s390x) | +|:---------------------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:---------------------------------------------------------------|:--------------------------------------------------------------|--------------------------------------------------------------| +| [CentOS]({{ install-prefix }}/centos.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos.md) | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/centos.md) | | | +| [Debian]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | | | | | | +| [Fedora]({{ install-prefix }}/docker-ce/fedora.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora.md) | | | | | | | +| [Microsoft Windows Server 2016](/install/windows/docker-ee.md) | | | | | [{{ green-check }}](/install/windows/docker-ee.md) | | | +| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle.md) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle.md) | | | +| [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel.md) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | +| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse.md) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | +| [Ubuntu]({{ install-prefix }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md)| > Limitations for Docker EE on IBM Power architecture > diff --git a/_includes/docker_schedule_matrix.md b/_includes/docker_schedule_matrix.md index 14d004c376..d217cdfe42 100644 --- a/_includes/docker_schedule_matrix.md +++ b/_includes/docker_schedule_matrix.md @@ -1,7 +1,7 @@ -{% capture green-check %}![yes](/engine/installation/images/green-check.svg){: style="height: 14px; display: inline-block"}{% endcapture %} +{% capture green-check %}![yes](/install/images/green-check.svg){: style="height: 14px; display: inline-block"}{% endcapture %} {: style="width: 75%" } -| Month | Docker CE Edge | Docker CE Stable | +| Month | Docker CE Edge | Docker CE Stable | |:----------|:------------------|:------------------| | January | {{ green-check }} | | | February | {{ green-check }} | | diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index cad69e4d99..c9ea2c774c 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -330,7 +330,7 @@ You must delete any edited configuration files manually. {% elsif section == "linux-install-nextsteps" %} -- Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue with the [User Guide](/engine/userguide/index.md). diff --git a/_includes/global-header.html b/_includes/global-header.html index 514d05bdd1..cf4dcbd764 100644 --- a/_includes/global-header.html +++ b/_includes/global-header.html @@ -50,7 +50,7 @@

{{ site.name }}

Docker provides a way to run applications securely isolated in a container, packaged with all its dependencies and libraries.

diff --git a/_includes/why_d4a.md b/_includes/why_d4a.md index 336f5b6ef5..6c4391fb14 100644 --- a/_includes/why_d4a.md +++ b/_includes/why_d4a.md @@ -1,4 +1,4 @@ -The [Docker for {{cloudprovider}}](https://docs.docker.com/docker-for-{{cloudprovider | downcase}}/) +The [Docker for {{cloudprovider}}](/docker-for-{{cloudprovider | downcase}}/) project was created and is being actively developed to ensure that Docker users can enjoy a fantastic out-of-the-box experience on {{cloudprovider}}. It is now generally available and can now be used by everyone. @@ -98,7 +98,7 @@ in bug reports. # Try it today -Ready to get started? [Try Docker for {{cloudprovider}} today](https://docs.docker.com/docker-for-{{cloudprovider | downcase}}/). +Ready to get started? [Try Docker for {{cloudprovider}} today](/docker-for-{{cloudprovider | downcase}}/). We'd be happy to hear your feedback via e-mail at docker-for-iaas@docker.com or in the issue repository [for {{cloudprovider}}](https://github.com/docker/for-{{cloudprovider | downcase}}). diff --git a/compose/aspnet-mssql-compose.md b/compose/aspnet-mssql-compose.md index f74ae285ad..f7b36d67d7 100644 --- a/compose/aspnet-mssql-compose.md +++ b/compose/aspnet-mssql-compose.md @@ -9,8 +9,8 @@ Compose to set up and run the sample ASP.NET Core application using the [ASP.NET Core Build image](https://hub.docker.com/r/microsoft/aspnetcore-build/) with the [SQL Server on Linux image](https://hub.docker.com/r/microsoft/mssql-server-linux/). -You just need to have [Docker Engine](https://docs.docker.com/engine/installation/) -and [Docker Compose](https://docs.docker.com/compose/install/) installed on your +You just need to have [Docker Engine](/install/index.md) +and [Docker Compose](/compose/install/) installed on your platform of choice: Linux, Mac or Windows. For this sample, we create a sample .NET Core Web Application using the @@ -25,8 +25,8 @@ configure this app to use our SQL Server database, and then create a 1. Create a new directory for your application. This directory is the context of your docker-compose project. For - [Docker for Windows](https://docs.docker.com/docker-for-windows/#/shared-drives) and - [Docker for Mac](https://docs.docker.com/docker-for-mac/#/file-sharing), you + [Docker for Windows](/docker-for-windows/#/shared-drives) and + [Docker for Mac](/docker-for-mac/#/file-sharing), you need to set up file sharing for the volume that you need to map. 1. Within your directory, use the `aspnetcore-build` Docker image to generate a @@ -170,8 +170,8 @@ configure this app to use our SQL Server database, and then create a 1. Make sure you allocate at least 4GB of memory to Docker Engine. Here is how to do it on - [Docker for Mac](https://docs.docker.com/docker-for-mac/#/advanced) and - [Docker for Windows](https://docs.docker.com/docker-for-windows/#/advanced). + [Docker for Mac](/docker-for-mac/#/advanced) and + [Docker for Windows](/docker-for-windows/#/advanced). This is necessary to run the SQL Server on Linux container. 1. Run the `docker-compose up` command. After a few seconds, you should be able diff --git a/compose/gettingstarted.md b/compose/gettingstarted.md index cbf08a6227..ecbfc0f015 100644 --- a/compose/gettingstarted.md +++ b/compose/gettingstarted.md @@ -11,7 +11,7 @@ understandable even if you're not familiar with it. ## Prerequisites -Make sure you have already installed both [Docker Engine](/engine/installation/) and [Docker +Make sure you have already installed both [Docker Engine](/install/index.md) and [Docker Compose](install.md). You don't need to install Python or Redis, as both are provided by Docker images. diff --git a/compose/install.md b/compose/install.md index 95c3e52198..630429f1a6 100644 --- a/compose/install.md +++ b/compose/install.md @@ -16,12 +16,12 @@ have Docker Engine installed either locally or remote, depending on your setup. included as part of those desktop installs. - On Linux systems, first install the -[Docker](/engine/installation/index.md#server){: target="_blank" class="_"} +[Docker](/install/index.md#server){: target="_blank" class="_"} for your OS as described on the Get Docker page, then come back here for instructions on installing Compose on Linux systems. -- To run Compose as a non-root user, see [Manage Docker as a non-root user](/engine/installation/linux/linux-postinstall.md). +- To run Compose as a non-root user, see [Manage Docker as a non-root user](/install/linux/linux-postinstall.md). ## Install Compose @@ -58,7 +58,7 @@ install Compose separately. Docker install instructions for these are here: * [Get Docker Toolbox](/toolbox/overview.md) (for older systems) **If you are running the Docker daemon and client directly on Microsoft -Windows Server 2016** (with [Docker EE for Windows Server 2016](/engine/installation/windows/docker-ee.md), you _do_ need to install +Windows Server 2016** (with [Docker EE for Windows Server 2016](/install/windows/docker-ee.md), you _do_ need to install Docker Compose. To do so, follow these steps: 1. Start an "elevated" PowerShell (run it as administrator). diff --git a/compose/reference/overview.md b/compose/reference/overview.md index f85787defc..8e23373dca 100644 --- a/compose/reference/overview.md +++ b/compose/reference/overview.md @@ -132,7 +132,7 @@ the current directory, either from the command line or by setting up a an environment file. For an example of using the `-f` option at the command line, suppose you are -running the [Compose Rails sample](https://docs.docker.com/compose/rails/), and +running the [Compose Rails sample](/compose/rails/), and have a `docker-compose.yml` file in a directory called `sandbox/rails`. You can use a command like [docker-compose pull](/compose/reference/pull.md) to get the postgres image for the `db` service from anywhere by using the `-f` flag as diff --git a/datacenter/dtr/2.2/guides/admin/configure/use-a-load-balancer.md b/datacenter/dtr/2.2/guides/admin/configure/use-a-load-balancer.md index 3ff600901f..2fa20ebb0b 100644 --- a/datacenter/dtr/2.2/guides/admin/configure/use-a-load-balancer.md +++ b/datacenter/dtr/2.2/guides/admin/configure/use-a-load-balancer.md @@ -55,7 +55,7 @@ This endpoint only checks the health of a *single* replica. To get the health of every replica in a cluster, query each replica individually. The `/api/v0/meta/cluster_status` -[endpoint](https://docs.docker.com/datacenter/dtr/2.2/reference/api/) +[endpoint](/datacenter/dtr/2.2/reference/api/) returns a JSON object for the entire cluster *as observed* by the replica being queried, and it takes the form: diff --git a/datacenter/dtr/2.2/guides/index.md b/datacenter/dtr/2.2/guides/index.md index a66ce92b66..d4cc9d8df9 100644 --- a/datacenter/dtr/2.2/guides/index.md +++ b/datacenter/dtr/2.2/guides/index.md @@ -30,10 +30,10 @@ and metadata such that if a machine fails, DTR continues to operate and can be r ## Efficiency -DTR has the ability to [cache images closer to users](https://docs.docker.com/datacenter/dtr/2.2/guides/admin/configure/deploy-caches/) +DTR has the ability to [cache images closer to users](/datacenter/dtr/2.2/guides/admin/configure/deploy-caches/) to reduce the amount of bandwidth used during docker pulls. -DTR has the ability to [clean up unreferenced manifests and layers](https://docs.docker.com/datacenter/dtr/2.2/guides/admin/configure/garbage-collection/). +DTR has the ability to [clean up unreferenced manifests and layers](/datacenter/dtr/2.2/guides/admin/configure/garbage-collection/). ## Built-in access control diff --git a/datacenter/install/linux.md b/datacenter/install/linux.md index ac1b0b11d8..a17ec97d2b 100644 --- a/datacenter/install/linux.md +++ b/datacenter/install/linux.md @@ -13,7 +13,7 @@ Once you get your trial license, you can install Docker EE on your Linux servers. Make sure all the hosts you want to manage with Docker EE have a minimum of: -* [Docker Enterprise Edition](/engine/installation/index.md) version 17.06 or higher +* [Docker Enterprise Edition](/install/index.md) version 17.06 or higher * Linux kernel version 3.10 or higher * 4.00 GB of RAM * 3.00 GB of available disk space @@ -31,7 +31,7 @@ Also, make sure the hosts are running one of these operating systems: ## Step 1: Install Docker EE Container Engine Install the Docker Enterprise Edition container engine on all hosts you want -to manage by following [these instructions](/engine/installation/index.md). +to manage by following [these instructions](/install/index.md). ## Step 2: Install Universal Control Plane diff --git a/datacenter/ucp/2.2/guides/admin/backups-and-disaster-recovery.md b/datacenter/ucp/2.2/guides/admin/backups-and-disaster-recovery.md index 0749c6f357..af3a1da1d1 100644 --- a/datacenter/ucp/2.2/guides/admin/backups-and-disaster-recovery.md +++ b/datacenter/ucp/2.2/guides/admin/backups-and-disaster-recovery.md @@ -164,7 +164,7 @@ UCP restore recovers the following assets from the backup file: authentication backends. UCP restore does not include swarm assets such as cluster membership, services, networks, -secrets, etc. [Learn to backup a swarm](https://docs.docker.com/engine/swarm/admin_guide/#back-up-the-swarm). +secrets, etc. [Learn to backup a swarm](/engine/swarm/admin_guide/#back-up-the-swarm). There are two ways to restore UCP: diff --git a/datacenter/ucp/2.2/guides/admin/install/index.md b/datacenter/ucp/2.2/guides/admin/install/index.md index 6c49345b38..6800f815ca 100644 --- a/datacenter/ucp/2.2/guides/admin/install/index.md +++ b/datacenter/ucp/2.2/guides/admin/install/index.md @@ -20,7 +20,7 @@ UCP is a containerized application that requires the commercially supported Docker Engine to run. Install Docker EE on each host that you plan to manage with UCP. -View the [supported platforms](/engine/installation/#supported-platforms) +View the [supported platforms](/install/index.md#supported-platforms) and click on your platform to get platform-specific instructions for installing Docker EE. diff --git a/datacenter/ucp/2.2/guides/admin/install/system-requirements.md b/datacenter/ucp/2.2/guides/admin/install/system-requirements.md index 664161f1ee..fb0e421457 100644 --- a/datacenter/ucp/2.2/guides/admin/install/system-requirements.md +++ b/datacenter/ucp/2.2/guides/admin/install/system-requirements.md @@ -11,7 +11,7 @@ Before installing, be sure your infrastructure has these requirements. You can install UCP on-premises or on a cloud provider. Common requirements: -* [Docker Enterprise Edition](/engine/installation/index.md) version 17.06 or higher +* [Docker Enterprise Edition](/install/index.md) version 17.06 or higher * Linux kernel version 3.10 or higher * A static IP address diff --git a/deploy/test.md b/deploy/test.md index 07d9b2cb97..7349e69d58 100644 --- a/deploy/test.md +++ b/deploy/test.md @@ -25,9 +25,9 @@ enter your Lorem Ipsum value for {{ site.tablabels[tab.version] }}, then click **Save**. {% if include.version=="ucp-3.0" %} -![Image number 1](https://docs.docker.com/datacenter/ucp/2.2/guides/images/monitor-ucp-0.png) +![Image number 1](/datacenter/ucp/2.2/guides/images/monitor-ucp-0.png) {% elsif include.version=="ucp-2.2" %} -![Image number 2](https://docs.docker.com/datacenter/ucp/2.2/guides/images/monitor-ucp-1.png) +![Image number 2](/datacenter/ucp/2.2/guides/images/monitor-ucp-1.png) {% endif %} {% endif %} diff --git a/develop/sdk/examples.md b/develop/sdk/examples.md index 37a2693e43..c1892f7dcd 100644 --- a/develop/sdk/examples.md +++ b/develop/sdk/examples.md @@ -10,7 +10,7 @@ redirect_from: --- After you -[install Docker](/engine/installation.md), you can +[install Docker](/install/index.md), you can [install the Go and Python SDKs](/develop/sdk/index.md#install-the-sdks) and also try out the Docker Engine API. diff --git a/docker-cloud/builds/automated-build.md b/docker-cloud/builds/automated-build.md index 9102cf8ba9..e2fcd023de 100644 --- a/docker-cloud/builds/automated-build.md +++ b/docker-cloud/builds/automated-build.md @@ -73,8 +73,8 @@ the code repository service where the image's source code is stored. Selecting **Edge** lets you to take advantage of [multi-stage builds](/engine/userguide/eng-image/multistage-build/). For more information and examples, see the topic on how to [use multi-stage builds](/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds). You can learn more about **stable** and **edge** channels in the - [Install Docker overview](https://docs.docker.com/engine/installation/) - and the [Docker CE Edge](https://docs.docker.com/edge/) topics. + [Install Docker overview](/install/) + and the [Docker CE Edge](/edge/) topics. 7. Optionally, enable [autotests](automated-testing.md#enable-automated-tests-on-a-repository). diff --git a/docker-cloud/builds/automated-testing.md b/docker-cloud/builds/automated-testing.md index 5b861a197d..72bee906fe 100644 --- a/docker-cloud/builds/automated-testing.md +++ b/docker-cloud/builds/automated-testing.md @@ -20,7 +20,7 @@ built images to your Docker Cloud repository, enable [Automated Builds](automate To set up your automated tests, create a `docker-compose.test.yml` file which defines a `sut` service that lists the tests to be run. This file has a structure -similar to the [docker-cloud.yml](https://docs.docker.com/docker-cloud/apps/stack-yaml-reference/). +similar to the [docker-cloud.yml](/docker-cloud/apps/stack-yaml-reference/). The `docker-compose.test.yml` file should be located in the same directory that contains the Dockerfile used to build the image. diff --git a/docker-cloud/builds/push-images.md b/docker-cloud/builds/push-images.md index 53099f1bee..2168392ce3 100644 --- a/docker-cloud/builds/push-images.md +++ b/docker-cloud/builds/push-images.md @@ -15,7 +15,7 @@ available in Docker Cloud. If you don't have Swarm Mode enable, images pushed to Docker Hub automatically appear for you on the **Services/Wizard** page on Docker Cloud. > **Note**: You must use Docker Engine 1.6 or later to push to Docker Hub. -Follow the [official installation instructions](/engine/installation/){: target="_blank" class="_" } depending on your system. +Follow the [official installation instructions](/install/index.md){: target="_blank" class="_" } depending on your system. 1. In a terminal window, set the environment variable **DOCKER_ID_USER** as *your username* in Docker Cloud. diff --git a/docker-cloud/cloud-swarm/create-cloud-swarm-aws.md b/docker-cloud/cloud-swarm/create-cloud-swarm-aws.md index 3b37c257f5..02ef330499 100644 --- a/docker-cloud/cloud-swarm/create-cloud-swarm-aws.md +++ b/docker-cloud/cloud-swarm/create-cloud-swarm-aws.md @@ -37,7 +37,7 @@ provider. 4. Select Amazon Web Services as the service provider and select a channel (`Stable` or `Edge`) from the drop-down menu. - You can learn more about **stable** and **edge** channels in the [Install Docker overview](https://docs.docker.com/engine/installation/) and the [Docker CE Edge](https://docs.docker.com/edge/) topics. + You can learn more about **stable** and **edge** channels in the [Install Docker overview](/install/) and the [Docker CE Edge](/edge/) topics. In this example, we use the `Stable` channel. @@ -54,7 +54,7 @@ provider. ![](images/aws-create-swarm-3-region.png) - For guidance on setting up a VPC, see [Recommended VPC and subnet setup](https://docs.docker.com/docker-for-aws/faqs/#can-i-use-my-existing-vpc) in the Docker for AWS topics. + For guidance on setting up a VPC, see [Recommended VPC and subnet setup](/docker-for-aws/faqs/#can-i-use-my-existing-vpc) in the Docker for AWS topics. 6. Choose how many swarm managers and swarm worker nodes to deploy. diff --git a/docker-cloud/cloud-swarm/create-cloud-swarm-azure.md b/docker-cloud/cloud-swarm/create-cloud-swarm-azure.md index 3d857ca9f5..fc54bfd44c 100644 --- a/docker-cloud/cloud-swarm/create-cloud-swarm-azure.md +++ b/docker-cloud/cloud-swarm/create-cloud-swarm-azure.md @@ -47,7 +47,7 @@ Manager](https://azure.microsoft.com/en-us/blog/working-with-marketplace-images- 4. Select Microsoft Azure as the service provider, select a channel (`Stable` or `Edge`) from the drop-down menu, provide an App name, and select the Azure Subscription you want to use. - You can learn more about **stable** and **edge** channels in the [Install Docker overview](https://docs.docker.com/engine/installation/) and the [Docker CE Edge](https://docs.docker.com/edge/) topics. + You can learn more about **stable** and **edge** channels in the [Install Docker overview](install/) and the [Docker CE Edge](/edge/) topics. In this example, we use the `Stable` channel, our app name is "voting_app" and we've selected a Pay-As-You-Go subscription. diff --git a/docker-for-aws/iam-permissions.md b/docker-for-aws/iam-permissions.md index 954c63907f..29af22b9ac 100644 --- a/docker-for-aws/iam-permissions.md +++ b/docker-for-aws/iam-permissions.md @@ -9,7 +9,7 @@ The following IAM permissions are required to use Docker for AWS. Before you deploy Docker for AWS, your account needs these permissions for the stack to deploy correctly. If you create and use an IAM role with these permissions for creating the stack, CloudFormation uses the role's permissions instead of your own, using the AWS CloudFormation Service Role feature. -For instructions, see [Link Amazon Web Services to Docker Cloud](https://docs.docker.com/docker-cloud/cloud-swarm/link-aws-swarm/). +For instructions, see [Link Amazon Web Services to Docker Cloud](/docker-cloud/cloud-swarm/link-aws-swarm/). This feature is called [AWS CloudFormation Service Role](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-servicerole.html?icmpid=docs_cfn_console) follow the link for more information. diff --git a/docker-for-ibm-cloud/dtr-ibm-cos.md b/docker-for-ibm-cloud/dtr-ibm-cos.md index 204ad717d5..52a2877232 100644 --- a/docker-for-ibm-cloud/dtr-ibm-cos.md +++ b/docker-for-ibm-cloud/dtr-ibm-cos.md @@ -5,7 +5,7 @@ title: Set up IBM Cloud Object Storage for Docker Trusted Registry --- # Use DTR with Docker EE for IBM Cloud -To use [Docker Trusted Registry (DTR)](docs.docker.com/datacenter/dtr/2.4/guides/) with Docker EE for IBM Cloud, configure DTR to store images on [IBM Cloud Object Storage (COS)](https://ibm-public-cos.github.io/crs-docs/). +To use [Docker Trusted Registry (DTR)](/datacenter/dtr/2.4/guides/) with Docker EE for IBM Cloud, configure DTR to store images on [IBM Cloud Object Storage (COS)](https://ibm-public-cos.github.io/crs-docs/). Your DTR files are stored in "buckets", and users have permissions to read, write, and delete files from those buckets. When you integrate DTR with IBM Cloud Object Storage, DTR sends all read and write operations to the COS bucket so that the images are persisted there. diff --git a/docker-for-mac/osxfs-caching.md b/docker-for-mac/osxfs-caching.md index 802179e8bb..a16d854b02 100644 --- a/docker-for-mac/osxfs-caching.md +++ b/docker-for-mac/osxfs-caching.md @@ -7,9 +7,9 @@ toc_min: 2 --- [Docker 17.04 CE -Edge](https://docs.docker.com/edge/#docker-ce-edge-new-features) adds support +Edge](/edge/index.md#docker-ce-edge-new-features) adds support for two new flags to the [docker run `-v`, -`--volume`](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) +`--volume`](/engine/reference/run/#volume-shared-filesystems) option, `cached` and `delegated`, that can significantly improve the performance of mounted volume access on Docker for Mac. These options begin to solve some of the challenges discussed in [Performance issues, solutions, and @@ -100,8 +100,8 @@ temporary discrepancies are allowed between container and host. Each of these configurations (`consistent`, `cached`, `delegated`) can be specified as a suffix to the -[`-v`](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) -option of [`docker run`](https://docs.docker.com/engine/reference/run.md). For +[`-v`](/engine/reference/run/#volume-shared-filesystems) +option of [`docker run`](/engine/reference/run.md). For example, to bind-mount `/Users/yallop/project` in a container under the path `/project`, you might run the following command: diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index bbbb4c9b52..4b930ccee9 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -396,9 +396,9 @@ access the mounted volumes. or `cannot start service` you may need to enable shared drives. See [Volume mounting requires shared drives for Linux containers](troubleshoot.md#volume-mounting-requires-shared-drives-for-linux-containers).) > -* If possible, avoid volume mounts from the Windows host, and instead mount on +* If possible, avoid volume mounts from the Windows host, and instead mount on the MobyVM, or use a [data -volume](https://docs.docker.com/engine/tutorials/dockervolumes.md#data-volumes) +volume](/engine/tutorials/dockervolumes.md#data-volumes) (named volume) or [data container](/engine/tutorials/dockervolumes.md#creating-and-mounting-a-data-volume-container). There are a number of issues with using host-mounted volumes and network paths diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index 329ec6ce74..e83e6c50b8 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -64,7 +64,7 @@ For more about Stable and Edge channels, see the * Legacy (`.msi`) installers are available for [Edge](https://download.docker.com/win/edge/InstallDocker.msi) and [Stable](https://download.docker.com/win/stable/InstallDocker.msi) channels. -* The Docker for Windows is designed to configure Docker development environments on Windows 10 and on Windows Server 2016. You can develop both Docker Linux containers and Docker Windows containers with Docker for Windows. To run Docker Windows containers in production, see instructions for [installing Docker EE on Windows Server 2016](/engine/installation/windows/docker-ee.md). To run Docker Linux containers in production, see [instructions for installing Docker on Linux](/engine/installation/index.md). +* Docker for Windows is designed to configure Docker development environments on Windows 10 and on Windows Server 2016. You can develop both Docker Linux containers and Docker Windows containers with Docker for Windows. To run Docker Windows containers in production, see instructions for [installing Docker EE on Windows Server 2016](/install/windows/docker-ee.md). To run Docker Linux containers in production, see [instructions for installing Docker on Linux](/install/index.md). * Docker for Windows requires 64bit Windows 10 Pro with Hyper-V available. See [What to know before you install](/docker-for-windows/install.md#what-to-know-before-you-install) for a full list of prerequisites. diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index 9e57041da0..0eaed9f03e 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -195,7 +195,7 @@ write-ahead logging (WAL) with SQLite, as described in If possible, avoid using shared drives for volume mounts on the host with network paths, and instead mount on the MobyVM, or create a [data -volume](https://docs.docker.com/engine/tutorials/dockervolumes.md#data-volumes) +volume](/engine/tutorials/dockervolumes.md#data-volumes) (named volume) or [data container](/engine/tutorials/dockervolumes.md#creating-and-mounting-a-data-volume-container). See also, the [volumes key under service diff --git a/edge/engine/reference/commandline/README.md b/edge/engine/reference/commandline/README.md index e97d18a486..e411a96362 100644 --- a/edge/engine/reference/commandline/README.md +++ b/edge/engine/reference/commandline/README.md @@ -4,7 +4,7 @@ The files in this directory are stub files which include the file `/_includes/cli.md`, which parses YAML files generated from the [`docker/docker`](https://github.com/moby/moby) repository. The YAML files are parsed into output files like -[https://docs.docker.com/engine/reference/commandline/build/](https://docs.docker.com/engine/reference/commandline/build/). +[/engine/reference/commandline/build/](/engine/reference/commandline/build/). ## How the output is generated diff --git a/edge/index.md b/edge/index.md index ac98f2774e..c767bc5267 100644 --- a/edge/index.md +++ b/edge/index.md @@ -16,7 +16,7 @@ still need to subscribe to the stable channel as well. Commercial support is not available for Docker CE. For information about all Docker release channels and expectations about -support, see [Docker channels](/engine/installation/#docker-channels). +support, see [Docker channels](/install/index.md#docker-channels). This page lists features that are only available in Docker CE Edge releases. Where applicable, the API and CLI reference documentation has been updated to diff --git a/engine/admin/index.md b/engine/admin/index.md index 1f300d7e25..f591d1ed61 100644 --- a/engine/admin/index.md +++ b/engine/admin/index.md @@ -15,9 +15,9 @@ daemon if you run into issues. ## Start the daemon using operating system utilities The command to start Docker depends on your operating system. Check the correct -page under [Install Docker](/engine/installation/index.md). To configure Docker +page under [Install Docker](/install/index.md). To configure Docker to start automatically at system boot, see -[Configure Docker to start on boot](/engine/installation/linux/linux-postinstall.md#configure-docker-to-start-on-boot). +[Configure Docker to start on boot](/install/linux/linux-postinstall.md#configure-docker-to-start-on-boot). ## Start the daemon manually @@ -124,7 +124,7 @@ ExecStart=/usr/bin/dockerd ``` There are other times when you might need to configure `systemd` with Docker, such as -[configuring a HTTP or HTTPS proxy](https://docs.docker.com/engine/admin/systemd/#httphttps-proxy). +[configuring a HTTP or HTTPS proxy](/engine/admin/systemd/#httphttps-proxy). > **Note**: If you override this option and then do not specify a `hosts` entry in the `daemon.json` > or a `-H` flag when starting Docker manually, Docker fails to start. diff --git a/engine/admin/resource_constraints.md b/engine/admin/resource_constraints.md index b498852761..151bfb0b07 100644 --- a/engine/admin/resource_constraints.md +++ b/engine/admin/resource_constraints.md @@ -23,7 +23,7 @@ WARNING: No swap limit support ``` Consult your operating system's documentation for enabling them. -[Learn more](/engine/installation/linux/linux-postinstall.md#your-kernel-does-not-support-cgroup-swap-limit-capabilities). +[Learn more](/install/linux/linux-postinstall.md#your-kernel-does-not-support-cgroup-swap-limit-capabilities). ## Memory diff --git a/engine/admin/systemd.md b/engine/admin/systemd.md index fbfa7e6ce2..8481913c6b 100644 --- a/engine/admin/systemd.md +++ b/engine/admin/systemd.md @@ -33,7 +33,7 @@ do not have `systemctl`, use the `service` command. ### Start automatically at system boot If you want Docker to start at boot, see -[Configure Docker to start on boot](/engine/installation/linux/linux-postinstall.md/#configure-docker-to-start-on-boot). +[Configure Docker to start on boot](/install/linux/linux-postinstall.md/#configure-docker-to-start-on-boot). ## Custom Docker daemon options diff --git a/engine/examples/dotnetcore.md b/engine/examples/dotnetcore.md index 6ec33f0cdb..2fb5463e1e 100644 --- a/engine/examples/dotnetcore.md +++ b/engine/examples/dotnetcore.md @@ -36,7 +36,7 @@ tutorial](https://www.asp.net/get-started) to initialize a project or clone our Containers](https://docs.microsoft.com/en-us/virtualization/windowscontainers/about/). The tags below are multi-arch meaning they pull either Windows or Linux containers depending on what mode is set in [Docker for -Windows](https://docs.docker.com/docker-for-windows/). Read more on [switching containers](https://docs.docker.com/docker-for-windows/#switch-between-windows-and-linux-containers). +Windows](/docker-for-windows/). Read more on [switching containers](/docker-for-windows/#switch-between-windows-and-linux-containers). 3. The `Dockerfile` assumes that your application is called `aspnetapp`. Change the `Dockerfile` to use the DLL file of your project. @@ -60,7 +60,7 @@ ENTRYPOINT ["dotnet", "aspnetapp.dll"] ``` 4. To make your build context as small as possible add a [`.dockerignore` - file](https://docs.docker.com/engine/reference/builder/#dockerignore-file) + file](/engine/reference/builder/#dockerignore-file) to your project folder and copy the following into it. ```dockerignore @@ -82,7 +82,7 @@ $ docker run -d -p 8080:80 --name myapp aspnetapp * Go to [localhost:8080](http://localhost:8080) to access your app in a web browser. * If you are using the Nano [Windows - Container](https://docs.docker.com/docker-for-windows/) and have not updated + Container](/docker-for-windows/) and have not updated to the Windows Creator Update there is a bug affecting how [Windows 10 talks to Containers via "NAT"](https://github.com/Microsoft/Virtualization-Documentation/issues/181#issuecomment-252671828) diff --git a/engine/installation/windows/ee-preview.md b/engine/installation/windows/ee-preview.md deleted file mode 100644 index 2192f37096..0000000000 --- a/engine/installation/windows/ee-preview.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -description: How to install Docker on Windows Server 1709 and Windows 10 Fall Creators Update -keywords: Windows, Windows Server, install, download, Docker EE, preview, Windows 1709 -title: Preview Docker for Windows Server 1709 and Windows 10 Fall Creators Update ---- - -Windows versions released in the fall of 2017 (Windows Server 1709 and Windows 10 Fall Creators Update for server and client respectively) contain improvements that improve the experience of running Docker on Windows. Enhancements include: - - * Docker ingress mode service publishing and virtual-IP based service discovery - * Mounting container-host named pipes into Windows containers - * Smaller Windows container base images - * Linux containers on Windows - -Check out the [blog post announcement for details](https://blog.docker.com/2017/09/docker-windows-server-1709/) on use-cases for these new features. - -## Windows 10 Fall Creators Update - -Windows 10 users can take advantage of the new Windows features by [installing Docker CE _Edge_ for Windows 10](https://docs.docker.com/docker-for-windows/install/). Edge comes with the latest Docker platform builds that support the new Windows features. - -## Windows Server 1709 - -The latest version of Docker Enterprise Edition Basic is 17.06 and Docker EE 17.06 is the recommended way to run Docker containers on Windows Server 1709 in production. Unfortunately, Docker Universal Control plane does not support managing Windows Server 1709 workers yet. Only Docker EE Basic is supported on Windows Server 1709. - -Docker EE 17.06 does not support improved networking (ingress and virtual-IP based service discovery), named pipe mounting nor Linux containers on Windows Server 1709 (it does benefit from the smaller base images). For users that want to test these new Windows features with Docker, Docker Inc. makes available preview builds of Docker EE. These can be installed from the `preview` channel using the standard PowerShell installation method: - - Install-Module DockerProvider - Install-Package Docker -ProviderName DockerProvider -RequiredVersion preview - -Again, Docker Universal Control Plane does not work on Windows Server 1709 whether running Docker EE 17.06 or Docker EE preview. - -## FAQ - -### Image compatibility - -Windows container base images are not compatible between Windows Server 2016 and Windows Server 1709 (except that Windows Server 1709 can run Windows Server 2016 based images when using Hyper-V isolation - but not the other way around). Check the Microsoft compatibility docs for details [1][2]. - -[1]: https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility -[2]: https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/system-requirements diff --git a/engine/reference/commandline/README.md b/engine/reference/commandline/README.md index e97d18a486..e411a96362 100644 --- a/engine/reference/commandline/README.md +++ b/engine/reference/commandline/README.md @@ -4,7 +4,7 @@ The files in this directory are stub files which include the file `/_includes/cli.md`, which parses YAML files generated from the [`docker/docker`](https://github.com/moby/moby) repository. The YAML files are parsed into output files like -[https://docs.docker.com/engine/reference/commandline/build/](https://docs.docker.com/engine/reference/commandline/build/). +[/engine/reference/commandline/build/](/engine/reference/commandline/build/). ## How the output is generated diff --git a/engine/swarm/index.md b/engine/swarm/index.md index 11f6d10a46..f34c2a362d 100644 --- a/engine/swarm/index.md +++ b/engine/swarm/index.md @@ -4,9 +4,8 @@ keywords: docker, container, cluster, swarm title: Swarm mode overview --- -To use Docker in swarm mode, install Docker `1.12.0` or later. Install -instructions for all platforms are -[here](https://docs.docker.com/engine/installation/). +To use Docker in swarm mode, install Docker. See +[installation instructions](/install/) for all operating systems and platforms. Current versions of Docker include *swarm mode* for natively managing a cluster of Docker Engines called a *swarm*. Use the Docker CLI to create a swarm, deploy diff --git a/engine/userguide/eng-image/dockerfile_best-practices.md b/engine/userguide/eng-image/dockerfile_best-practices.md index 450362858d..588fdcf280 100644 --- a/engine/userguide/eng-image/dockerfile_best-practices.md +++ b/engine/userguide/eng-image/dockerfile_best-practices.md @@ -127,7 +127,7 @@ the web application, database, and an in-memory cache in a decoupled manner. You may have heard that there should be "one process per container". While this mantra has good intentions, it is not necessarily true that there should be only one operating system process per container. In addition to the fact that -containers can now be [spawned with an init process](https://docs.docker.com/engine/reference/run/#/specifying-an-init-process), +containers can now be [spawned with an init process](/engine/reference/run/#/specifying-an-init-process), some programs might spawn additional processes of their own accord. For instance, [Celery](http://www.celeryproject.org/) can spawn multiple worker processes, or [Apache](https://httpd.apache.org/) might create a process per @@ -135,7 +135,7 @@ request. While "one process per container" is frequently a good rule of thumb, it is not a hard and fast rule. Use your best judgment to keep containers as clean and modular as possible. -If containers depend on each other, you can use [Docker container networks](https://docs.docker.com/engine/userguide/networking/) +If containers depend on each other, you can use [Docker container networks](/engine/userguide/networking/) to ensure that these containers can communicate. ### Minimize the number of layers @@ -286,7 +286,7 @@ out for. You should avoid `RUN apt-get upgrade` or `dist-upgrade`, as many of the “essential” packages from the parent images can't upgrade inside an -[unprivileged container](https://docs.docker.com/engine/reference/run/#security-configuration). +[unprivileged container](/engine/reference/run/#security-configuration). If a package contained in the parent image is out-of-date, you should contact its maintainers. If you know there’s a particular package, `foo`, that needs to be updated, use `apt-get install -y foo` to update automatically. diff --git a/engine/userguide/index.md b/engine/userguide/index.md index b2868446e6..3d03d38f6c 100644 --- a/engine/userguide/index.md +++ b/engine/userguide/index.md @@ -6,7 +6,7 @@ redirect_from: - /engine/userguide/intro/ --- -After you've [installed Docker](/engine/installation/) and completed the +After you've [installed Docker](/install/index.md) and completed the [Getting started guides](/get-started/), you're ready to take it to the next level. The topics in this section show how to develop and design your app, store your app's data, and get your app running in a scalable, secure, robust diff --git a/engine/userguide/storagedriver/aufs-driver.md b/engine/userguide/storagedriver/aufs-driver.md index b0e8e24a32..cd5debb017 100644 --- a/engine/userguide/storagedriver/aufs-driver.md +++ b/engine/userguide/storagedriver/aufs-driver.md @@ -22,7 +22,7 @@ potential performance advantages over the `aufs` storage driver. Stretch. - For Docker EE, AUFS is supported on Ubuntu. - If you use Ubuntu, you need to - [install extra packages](/engine/installation/linux/ubuntu.md#recommended-extra-packages-for-trusty-1404){: target="_blank" class="_"} + [install extra packages](/install/linux/ubuntu.md#recommended-extra-packages-for-trusty-1404){: target="_blank" class="_"} to add the AUFS module to the kernel. If you do not install these packages, you need to use `devicemapper` on Ubuntu 14.04 (which is not recommended), or `overlay2` on Ubuntu 16.04 and higher, which is also supported. diff --git a/enterprise/index.md b/enterprise/index.md index 17941df9a8..fd5602607b 100644 --- a/enterprise/index.md +++ b/enterprise/index.md @@ -45,7 +45,7 @@ Docker EE is available in three tiers: Docker EE is released quarterly. Releases use a time-based versioning scheme, so for example, Docker EE version 17.03 was released in March 2017. For schedule details, see -[Time-based release schedule](/engine/installation/#time-based-release-schedule). +[Time-based release schedule](/install/index.md#time-based-release-schedule). Each Docker EE release is supported and maintained for one year and receives security and critical bug fixes during this period. diff --git a/enterprise/upgrade.md b/enterprise/upgrade.md index 2b3ad6bb62..3d8423afd8 100644 --- a/enterprise/upgrade.md +++ b/enterprise/upgrade.md @@ -63,15 +63,15 @@ docker node update --availability drain ### Perform the upgrade -Upgrade the Docker Engine on the node by following the instructions for your +Upgrade Docker Engine on the node by following the instructions for your specific distribution: -* [Windows Server](/engine/installation/windows/docker-ee.md#update-docker-ee) -* [Ubuntu](/engine/installation/linux/docker-ee/ubuntu.md#upgrade-docker-ee) -* [RHEL](/engine/installation/linux/docker-ee/rhel.md#upgrade-docker-ee) -* [CentOS](/engine/installation/linux/docker-ee/centos.md#upgrade-docker-ee) -* [Oracle Linux](/engine/installation/linux/docker-ee/oracle.md#upgrade-docker-ee) -* [SLES](/engine/installation/linux/docker-ee/suse.md#upgrade-docker-ee) +* [Windows Server](/install/windows/docker-ee.md#update-docker-ee) +* [Ubuntu](/install/linux/docker-ee/ubuntu.md#upgrade-docker-ee) +* [RHEL](/install/linux/docker-ee/rhel.md#upgrade-docker-ee) +* [CentOS](/install/linux/docker-ee/centos.md#upgrade-docker-ee) +* [Oracle Linux](/install/linux/docker-ee/oracle.md#upgrade-docker-ee) +* [SLES](/install/linux/docker-ee/suse.md#upgrade-docker-ee) ### Make the node active diff --git a/get-started/index.md b/get-started/index.md index 0d9e4d4bc5..1308047b9a 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -141,14 +141,14 @@ entanglement; a containerized app "runs anywhere." Before we get started, make sure your system has the latest version of Docker installed. -[Install Docker](/engine/installation/index.md){: class="button outline-btn"} +[Install Docker](/install/index.md){: class="button outline-btn"}
> **Note**: version 1.13 or higher is required When you run `docker run hello-world`, look for a response like this: -> **Note**: You may need to add your user to the `docker` group to call this command without sudo. [Read more](https://docs.docker.com/engine/installation/linux/linux-postinstall/) +> **Note**: You may need to add your user to the `docker` group to call this command without sudo. [Read more](https://docs.docker.com/install/linux/linux-postinstall/) -> **Note**: If there are networking issues in your setup, `docker run hello-world` may fail to execute successfully. In case you are behind a proxy server and you suspect that it blocks the connection, check the [next part](https://docs.docker.com/get-started/part2/) of the tutorial. +> **Note**: If there are networking issues in your setup, `docker run hello-world` may fail to execute successfully. In case you are behind a proxy server and you suspect that it blocks the connection, check the [next part](/get-started/part2/) of the tutorial. ```shell $ docker run hello-world diff --git a/get-started/part3.md b/get-started/part3.md index d8afbb0bdb..c82b1b245d 100644 --- a/get-started/part3.md +++ b/get-started/part3.md @@ -15,7 +15,7 @@ Windows](/docker-for-windows/index.md) it's pre-installed, so you're good-to-go. On Linux systems you need to [install it directly](https://github.com/docker/compose/releases). On pre Windows 10 systems _without Hyper-V_, use [Docker -Toolbox](https://docs.docker.com/toolbox/overview.md). +Toolbox](/toolbox/overview.md). - Read the orientation in [Part 1](index.md). diff --git a/get-started/part4.md b/get-started/part4.md index 0c21799ca5..8b11eaa168 100644 --- a/get-started/part4.md +++ b/get-started/part4.md @@ -15,7 +15,7 @@ description: Learn how to create clusters of Dockerized machines. [Docker for Mac](/docker-for-mac/index.md) and [Docker for Windows](/docker-for-windows/index.md), but on Linux systems you need to [install it directly](/machine/install-machine/#installing-machine-directly). On pre Windows 10 systems _without Hyper-V_, as well as Windows 10 Home, use -[Docker Toolbox](https://docs.docker.com/toolbox/overview.md). +[Docker Toolbox](/toolbox/overview.md). - Read the orientation in [Part 1](index.md). diff --git a/get-started/part6.md b/get-started/part6.md index c4d7387566..716b01497a 100644 --- a/get-started/part6.md +++ b/get-started/part6.md @@ -7,7 +7,7 @@ description: Deploy your app to production using Docker CE or EE. ## Prerequisites -- [Install Docker version 1.13 or higher](/engine/installation/). +- [Install Docker](/install/index.md). - Get [Docker Compose](/compose/overview.md) as described in [Part 3 prerequisites](/get-started/part3.md#prerequisites). - Get [Docker Machine](/machine/overview.md) as described in [Part 4 prerequisites](/get-started/part4.md#prerequisites). - Read the orientation in [Part 1](index.md). @@ -310,7 +310,7 @@ essentially involves two steps: 1. [Get Docker Enterprise Edition for your server's OS from Docker Store](https://store.docker.com/search?offering=enterprise&type=edition){: onclick="ga('send', 'event', 'Get Started Referral', 'Enterprise', 'Get Docker EE for your OS');"}. 2. Follow the [instructions to install Datacenter on your own host](/datacenter/install/linux/){: onclick="ga('send', 'event', 'Get Started Referral', 'Enterprise', 'BYOH setup guide');"}. -> **Note**: Running Windows containers? View our [Windows Server setup guide](/engine/installation/windows/docker-ee.md){: onclick="ga('send', 'event', 'Get Started Referral', 'Enterprise', 'Windows Server setup guide');"}. +> **Note**: Running Windows containers? View our [Windows Server setup guide](/install/windows/docker-ee.md){: onclick="ga('send', 'event', 'Get Started Referral', 'Enterprise', 'Windows Server setup guide');"}. {{ enterprisedeployapp }} {% endcapture %} diff --git a/hackathon/index.md b/hackathon/index.md index 037be5e442..8f0c99bb56 100644 --- a/hackathon/index.md +++ b/hackathon/index.md @@ -281,4 +281,4 @@ Participation in the Docs Hackathon and submission of content therein gives Dock For the purposes of copyright all content submitted to Docker for the Docs Hackathon belongs to Docker. -Winners will be announced the week of April 22nd on https://docs.docker.com/hackathon. The winners will be named by GitHub username and contacted via email. +Winners will be announced the week of April 22nd on [https://docs.docker.com/hackathon](/hackathon/index.md). The winners will be named by GitHub username and contacted via email. diff --git a/index.md b/index.md index c32555e236..883e1d798e 100644 --- a/index.md +++ b/index.md @@ -47,7 +47,7 @@ containers and automate the development pipeline from a single environment. Choose the Edge channel to get access to the latest features, or the Stable channel for more predictability. -[Learn more about Docker CE](/engine/installation/#platform-support-matrix){: class="button outline-btn"} +[Learn more about Docker CE](/install/index.md#platform-support-matrix){: class="button outline-btn"}
@@ -60,7 +60,7 @@ and supported to provide enterprises with the most secure container platform in the industry to modernize all applications. Docker EE Advanced comes with enterprise [add-ons](#docker-ee-add-ons) like UCP and DTR. -[Learn more about Docker EE](/engine/installation/#platform-support-matrix){: class="button outline-btn"} +[Learn more about Docker EE](/install/#platform-support-matrix){: class="button outline-btn"}
@@ -91,9 +91,9 @@ the industry to modernize all applications. Docker EE Advanced comes with enterp
- Docker for Linux + Docker for Linux
-

Docker for Linux

+

Docker for Linux

Install Docker on a computer which already has a Linux distribution installed.

diff --git a/engine/installation/images/bad_host.png b/install/images/bad_host.png similarity index 100% rename from engine/installation/images/bad_host.png rename to install/images/bad_host.png diff --git a/engine/installation/images/cool_view.png b/install/images/cool_view.png similarity index 100% rename from engine/installation/images/cool_view.png rename to install/images/cool_view.png diff --git a/engine/installation/images/ec2-ubuntu.png b/install/images/ec2-ubuntu.png similarity index 100% rename from engine/installation/images/ec2-ubuntu.png rename to install/images/ec2-ubuntu.png diff --git a/engine/installation/images/ec2_instance_details.png b/install/images/ec2_instance_details.png similarity index 100% rename from engine/installation/images/ec2_instance_details.png rename to install/images/ec2_instance_details.png diff --git a/engine/installation/images/ec2_instance_type.png b/install/images/ec2_instance_type.png similarity index 100% rename from engine/installation/images/ec2_instance_type.png rename to install/images/ec2_instance_type.png diff --git a/engine/installation/images/ec2_launch_instance.png b/install/images/ec2_launch_instance.png similarity index 100% rename from engine/installation/images/ec2_launch_instance.png rename to install/images/ec2_launch_instance.png diff --git a/engine/installation/images/good_host.png b/install/images/good_host.png similarity index 100% rename from engine/installation/images/good_host.png rename to install/images/good_host.png diff --git a/engine/installation/images/green-check.svg b/install/images/green-check.svg similarity index 100% rename from engine/installation/images/green-check.svg rename to install/images/green-check.svg diff --git a/engine/installation/images/kitematic.png b/install/images/kitematic.png similarity index 100% rename from engine/installation/images/kitematic.png rename to install/images/kitematic.png diff --git a/engine/installation/images/linux_docker_host.svg b/install/images/linux_docker_host.svg similarity index 100% rename from engine/installation/images/linux_docker_host.svg rename to install/images/linux_docker_host.svg diff --git a/engine/installation/images/mac-page-finished.png b/install/images/mac-page-finished.png similarity index 100% rename from engine/installation/images/mac-page-finished.png rename to install/images/mac-page-finished.png diff --git a/engine/installation/images/mac-page-two.png b/install/images/mac-page-two.png similarity index 100% rename from engine/installation/images/mac-page-two.png rename to install/images/mac-page-two.png diff --git a/engine/installation/images/mac-password-prompt.png b/install/images/mac-password-prompt.png similarity index 100% rename from engine/installation/images/mac-password-prompt.png rename to install/images/mac-password-prompt.png diff --git a/engine/installation/images/mac-success.png b/install/images/mac-success.png similarity index 100% rename from engine/installation/images/mac-success.png rename to install/images/mac-success.png diff --git a/engine/installation/images/mac-welcome-page.png b/install/images/mac-welcome-page.png similarity index 100% rename from engine/installation/images/mac-welcome-page.png rename to install/images/mac-welcome-page.png diff --git a/engine/installation/images/mac_docker_host.svg b/install/images/mac_docker_host.svg similarity index 100% rename from engine/installation/images/mac_docker_host.svg rename to install/images/mac_docker_host.svg diff --git a/engine/installation/images/my-docker-vm.png b/install/images/my-docker-vm.png similarity index 100% rename from engine/installation/images/my-docker-vm.png rename to install/images/my-docker-vm.png diff --git a/engine/installation/images/newsite_view.png b/install/images/newsite_view.png similarity index 100% rename from engine/installation/images/newsite_view.png rename to install/images/newsite_view.png diff --git a/engine/installation/images/nginx-webserver.png b/install/images/nginx-webserver.png similarity index 100% rename from engine/installation/images/nginx-webserver.png rename to install/images/nginx-webserver.png diff --git a/engine/installation/images/ocean_click_api.png b/install/images/ocean_click_api.png similarity index 100% rename from engine/installation/images/ocean_click_api.png rename to install/images/ocean_click_api.png diff --git a/engine/installation/images/ocean_droplet.png b/install/images/ocean_droplet.png similarity index 100% rename from engine/installation/images/ocean_droplet.png rename to install/images/ocean_droplet.png diff --git a/engine/installation/images/ocean_droplet_ubuntu.png b/install/images/ocean_droplet_ubuntu.png similarity index 100% rename from engine/installation/images/ocean_droplet_ubuntu.png rename to install/images/ocean_droplet_ubuntu.png diff --git a/engine/installation/images/ocean_gen_token.png b/install/images/ocean_gen_token.png similarity index 100% rename from engine/installation/images/ocean_gen_token.png rename to install/images/ocean_gen_token.png diff --git a/engine/installation/images/ocean_save_token.png b/install/images/ocean_save_token.png similarity index 100% rename from engine/installation/images/ocean_save_token.png rename to install/images/ocean_save_token.png diff --git a/engine/installation/images/ocean_token_create.png b/install/images/ocean_token_create.png similarity index 100% rename from engine/installation/images/ocean_token_create.png rename to install/images/ocean_token_create.png diff --git a/engine/installation/images/virtualization.png b/install/images/virtualization.png similarity index 100% rename from engine/installation/images/virtualization.png rename to install/images/virtualization.png diff --git a/engine/installation/images/win-page-6.png b/install/images/win-page-6.png similarity index 100% rename from engine/installation/images/win-page-6.png rename to install/images/win-page-6.png diff --git a/engine/installation/images/win-welcome.png b/install/images/win-welcome.png similarity index 100% rename from engine/installation/images/win-welcome.png rename to install/images/win-welcome.png diff --git a/engine/installation/images/win_docker_host.svg b/install/images/win_docker_host.svg similarity index 100% rename from engine/installation/images/win_docker_host.svg rename to install/images/win_docker_host.svg diff --git a/engine/installation/images/win_ver.png b/install/images/win_ver.png similarity index 100% rename from engine/installation/images/win_ver.png rename to install/images/win_ver.png diff --git a/engine/installation/images/windows-boot2docker-cmd.png b/install/images/windows-boot2docker-cmd.png similarity index 100% rename from engine/installation/images/windows-boot2docker-cmd.png rename to install/images/windows-boot2docker-cmd.png diff --git a/engine/installation/images/windows-boot2docker-powershell.png b/install/images/windows-boot2docker-powershell.png similarity index 100% rename from engine/installation/images/windows-boot2docker-powershell.png rename to install/images/windows-boot2docker-powershell.png diff --git a/engine/installation/images/windows-boot2docker-start.png b/install/images/windows-boot2docker-start.png similarity index 100% rename from engine/installation/images/windows-boot2docker-start.png rename to install/images/windows-boot2docker-start.png diff --git a/engine/installation/images/windows-finish.png b/install/images/windows-finish.png similarity index 100% rename from engine/installation/images/windows-finish.png rename to install/images/windows-finish.png diff --git a/engine/installation/index.md b/install/index.md similarity index 99% rename from engine/installation/index.md rename to install/index.md index c514c3e594..fc24741f22 100644 --- a/engine/installation/index.md +++ b/install/index.md @@ -12,6 +12,7 @@ redirect_from: - /engine/installation/linux/gentoolinux/ - /engine/installation/linux/docker-ce/ - /engine/installation/linux/docker-ee/ +- /engine/installation/ title: Install Docker --- diff --git a/engine/installation/linux/centos.md b/install/linux/centos.md similarity index 51% rename from engine/installation/linux/centos.md rename to install/linux/centos.md index 5e42f80683..b97808f03a 100644 --- a/engine/installation/linux/centos.md +++ b/install/linux/centos.md @@ -1,11 +1,13 @@ --- description: CentOS installation landing page title: Choose Docker CE or Docker EE on CentOS +redirect_from: +- /engine/installation/linux/centos/ --- The instructions for installing Docker on CentOS depend on whether you are using Docker Enterprise Edition (Docker EE) or Docker Community Edition (Docker CE). -[Learn more about Docker EE and Docker CE](/engine/installation/). +[Learn more about Docker EE and Docker CE](/install/index.md). -- [Install Docker EE on CentOS](/engine/installation/linux/docker-ee/centos.md) -- [Install Docker CE on CentOS](/engine/installation/linux/docker-ce/centos.md) +- [Install Docker EE on CentOS](/install/linux/docker-ee/centos.md) +- [Install Docker CE on CentOS](/install/linux/docker-ce/centos.md) diff --git a/engine/installation/linux/docker-ce/binaries.md b/install/linux/docker-ce/binaries.md similarity index 96% rename from engine/installation/linux/docker-ce/binaries.md rename to install/linux/docker-ce/binaries.md index 09c1e59057..051d0569c2 100644 --- a/engine/installation/linux/docker-ce/binaries.md +++ b/install/linux/docker-ce/binaries.md @@ -4,6 +4,7 @@ keywords: binaries, installation, docker, documentation, linux title: Install Docker CE from binaries redirect_from: - /engine/installation/binaries/ +- /engine/installation/linux/docker-ce/binaries/ --- > **Note**: You may have been redirected to this page because there is no longer @@ -64,7 +65,7 @@ instructions for enabling and configuring AppArmor or SELinux. [Enabling `seccomp` for Docker](/engine/security/seccomp.md). - Enable user namespaces if possible. See the - [Daemon user namespace options](/engine/reference/commandline/dockerd/#/daemon-user-namespace-options). + [Daemon user namespace options](/engine/reference/commandline/dockerd.md#daemon-user-namespace-options). ### Install static binaries @@ -111,7 +112,7 @@ instructions for enabling and configuring AppArmor or SELinux. ### Next steps -- Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue with the [User Guide](/engine/userguide/index.md). @@ -161,4 +162,4 @@ version. ## Next steps -Continue with the [User Guide](../userguide/index.md). +Continue with the [User Guide](/engine/userguide/index.md). diff --git a/engine/installation/linux/docker-ce/centos.md b/install/linux/docker-ce/centos.md similarity index 94% rename from engine/installation/linux/docker-ce/centos.md rename to install/linux/docker-ce/centos.md index fdc24859ee..e3997c218e 100644 --- a/engine/installation/linux/docker-ce/centos.md +++ b/install/linux/docker-ce/centos.md @@ -3,6 +3,7 @@ description: Instructions for installing Docker CE on CentOS keywords: requirements, apt, installation, centos, rpm, install, uninstall, upgrade, update redirect_from: - /engine/installation/centos/ +- /engine/installation/linux/docker-ce/centos/ title: Get Docker CE for CentOS toc_max: 4 --- @@ -16,7 +17,7 @@ To get started with Docker CE on CentOS, make sure you ### Docker EE customers To install Docker Enterprise Edition (Docker EE), go to -[Get Docker EE for CentOS](/engine/installation/linux/docker-ee/centos/) +[Get Docker EE for CentOS](/install/linux/docker-ee/centos/) **instead of this topic**. To learn more about Docker EE, see @@ -120,7 +121,7 @@ from the repository. > **Note**: Starting with Docker 17.06, stable releases are also pushed to > the **edge** and **test** repositories. - [Learn about **stable** and **edge** builds](/engine/installation/). + [Learn about **stable** and **edge** builds](/install/index.md). #### Install Docker CE @@ -191,7 +192,7 @@ from the repository. container runs, it prints an informational message and exits. Docker CE is installed and running. You need to use `sudo` to run Docker -commands. Continue to [Linux postinstall](/engine/installation/linux/linux-postinstall.md) to allow +commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. @@ -213,7 +214,7 @@ a new file each time you want to upgrade Docker. > **Note**: To install an **edge** package, change the word > `stable` in the above URL to `edge`. - > [Learn about **stable** and **edge** channels](/engine/installation/). + > [Learn about **stable** and **edge** channels](/install/index.md). 2. Install Docker CE, changing the path below to the path where you downloaded the Docker package. @@ -242,7 +243,7 @@ a new file each time you want to upgrade Docker. container runs, it prints an informational message and exits. Docker CE is installed and running. You need to use `sudo` to run Docker commands. -Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) to allow +Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. @@ -274,6 +275,6 @@ You must delete any edited configuration files manually. ## Next steps -- Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue with the [User Guide](/engine/userguide/index.md). diff --git a/engine/installation/linux/docker-ce/debian.md b/install/linux/docker-ce/debian.md similarity index 95% rename from engine/installation/linux/docker-ce/debian.md rename to install/linux/docker-ce/debian.md index 15f236e927..81f75ad55e 100644 --- a/engine/installation/linux/docker-ce/debian.md +++ b/install/linux/docker-ce/debian.md @@ -5,6 +5,7 @@ redirect_from: - /engine/installation/debian/ - /engine/installation/linux/raspbian/ - /engine/installation/linux/debian/ +- /install/linux/docker-ce/debian/ title: Get Docker CE for Debian toc_max: 4 --- @@ -19,7 +20,7 @@ To get started with Docker CE on Debian, make sure you Docker EE is not supported on Debian. For a list of supported operating systems and distributions for different Docker editions, see -[Docker variants](/engine/installation/#docker-variants). +[Docker variants](/install/index.md#docker-variants). ### OS requirements @@ -204,7 +205,7 @@ from the repository. > **Note**: Starting with Docker 17.06, stable releases are also pushed to > the **edge** and **test** repositories. - [Learn about **stable** and **edge** channels](/engine/installation/). + [Learn about **stable** and **edge** channels](/install/index.md). #### Install Docker CE @@ -275,7 +276,7 @@ from the repository. Docker CE is installed and running. The `docker` group is created but no users are added to it. You need to use `sudo` to run Docker -commands. Continue to [Linux postinstall](/engine/installation/linux/linux-postinstall.md) to allow +commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. For Raspbian, you can optionally [install Docker Compose for Raspbian](#install-docker-compose-for-raspbian). @@ -299,7 +300,7 @@ a new file each time you want to upgrade Docker. > **Note**: To install an **edge** package, change the word > `stable` in the URL to `edge`. - > [Learn about **stable** and **edge** channels](/engine/installation/). + > [Learn about **stable** and **edge** channels](/install/index.md). 2. Install Docker CE, changing the path below to the path where you downloaded the Docker package. @@ -322,7 +323,7 @@ a new file each time you want to upgrade Docker. Docker CE is installed and running. The `docker` group is created but no users are added to it. You need to use `sudo` to run Docker -commands. Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +commands. Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. For Raspbian, you can optionally [install Docker Compose for Raspbian](#install-docker-compose-for-raspbian). @@ -372,6 +373,6 @@ You must delete any edited configuration files manually. ## Next steps -- Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue with the [User Guide](/engine/userguide/index.md). diff --git a/engine/installation/linux/docker-ce/fedora.md b/install/linux/docker-ce/fedora.md similarity index 95% rename from engine/installation/linux/docker-ce/fedora.md rename to install/linux/docker-ce/fedora.md index 4d32c2237e..ea7a87ab0a 100644 --- a/engine/installation/linux/docker-ce/fedora.md +++ b/install/linux/docker-ce/fedora.md @@ -4,6 +4,7 @@ keywords: requirements, apt, installation, fedora, rpm, install, uninstall, upgr redirect_from: - /engine/installation/fedora/ - /engine/installation/linux/fedora/ +- /engine/installation/linux/docker-ce/fedora/ title: Get Docker CE for Fedora toc_max: 4 --- @@ -18,7 +19,7 @@ To get started with Docker CE on Fedora, make sure you Docker EE is not supported on Fedora. For a list of supported operating systems and distributions for different Docker editions, see -[Docker variants](/engine/installation/#docker-variants). +[Docker variants](/install/index.md#docker-variants). ### OS requirements @@ -113,7 +114,7 @@ from the repository. > **Note**: Starting with Docker 17.06, stable releases are also pushed to > the **edge** and **test** repositories. - [Learn about **stable** and **edge** channels](/engine/installation/). + [Learn about **stable** and **edge** channels](/install/index.md). #### Install Docker CE @@ -179,7 +180,7 @@ from the repository. Docker CE is installed and running. You need to use `sudo` to run Docker commands. Continue to -[Linux postinstall](/engine/installation/linux/linux-postinstall.md) to allow +[Linux postinstall](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. @@ -226,7 +227,7 @@ a new file each time you want to upgrade Docker CE. container runs, it prints an informational message and exits. Docker CE is installed and running. You need to use `sudo` to run Docker commands. -Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) to allow +Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. @@ -258,6 +259,6 @@ You must delete any edited configuration files manually. ## Next steps -- Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue with the [User Guide](/engine/userguide/index.md). diff --git a/engine/installation/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md similarity index 95% rename from engine/installation/linux/docker-ce/ubuntu.md rename to install/linux/docker-ce/ubuntu.md index e805243263..fd3668e54a 100644 --- a/engine/installation/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -5,6 +5,7 @@ redirect_from: - /engine/installation/ubuntulinux/ - /installation/ubuntulinux/ - /engine/installation/linux/ubuntulinux/ +- /engine/installation/linux/docker-ce/ubuntu/ title: Get Docker CE for Ubuntu toc_max: 4 --- @@ -18,7 +19,7 @@ To get started with Docker CE on Ubuntu, make sure you ### Docker EE customers To install Docker Enterprise Edition (Docker EE), go to -[Get Docker EE for Ubuntu](/engine/installation/linux/docker-ee/ubuntu/) +[Get Docker EE for Ubuntu](/install/linux/docker-ee/ubuntu.md) **instead of this topic**. To learn more about Docker EE, see @@ -223,7 +224,7 @@ the repository. > **Note**: Starting with Docker 17.06, stable releases are also pushed to > the **edge** and **test** repositories. - [Learn about **stable** and **edge** channels](/engine/installation/). + [Learn about **stable** and **edge** channels](/install/index.md). #### Install Docker CE @@ -284,7 +285,7 @@ the repository. Docker CE is installed and running. The `docker` group is created but no users are added to it. You need to use `sudo` to run Docker commands. -Continue to [Linux postinstall](../linux-postinstall.md) to allow +Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. @@ -307,7 +308,7 @@ a new file each time you want to upgrade Docker CE. > **Note**: To install an **edge** package, change the word > `stable` in the URL to `edge`. - > [Learn about **stable** and **edge** channels](/engine/installation/). + > [Learn about **stable** and **edge** channels](/install/index.md). 2. Install Docker CE, changing the path below to the path where you downloaded the Docker package. @@ -330,7 +331,7 @@ a new file each time you want to upgrade Docker CE. Docker CE is installed and running. The `docker` group is created but no users are added to it. You need to use `sudo` to run Docker commands. -Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) to allow +Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. @@ -361,6 +362,6 @@ You must delete any edited configuration files manually. ## Next steps -- Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue with the [User Guide](/engine/userguide/index.md). diff --git a/engine/installation/linux/docker-ee/centos.md b/install/linux/docker-ee/centos.md similarity index 96% rename from engine/installation/linux/docker-ee/centos.md rename to install/linux/docker-ee/centos.md index 74dacfe345..784d2de031 100644 --- a/engine/installation/linux/docker-ee/centos.md +++ b/install/linux/docker-ee/centos.md @@ -3,6 +3,7 @@ description: Instructions for installing Docker EE on CentOS keywords: requirements, apt, installation, centos, rpm, install, uninstall, upgrade, update redirect_from: - /engine/installation/centos/ +- /engine/installation/linux/docker-ee/centos/ title: Get Docker EE for CentOS toc_max: 4 --- @@ -18,7 +19,7 @@ toc_max: 4 ## Prerequisites Docker CE users should go to -[Get docker CE for CentOS](https://docs.docker.com/engine/installation/linux/docker-ce/centos/) +[Get docker CE for CentOS](/install/linux/docker-ce/centos.md) **instead of this topic**. ### Docker EE repository URL diff --git a/engine/installation/linux/docker-ee/oracle.md b/install/linux/docker-ee/oracle.md similarity index 98% rename from engine/installation/linux/docker-ee/oracle.md rename to install/linux/docker-ee/oracle.md index e2f31ee230..88335ca9b3 100644 --- a/engine/installation/linux/docker-ee/oracle.md +++ b/install/linux/docker-ee/oracle.md @@ -4,6 +4,7 @@ keywords: requirements, installation, oracle, ol, rpm, install, uninstall, upgra redirect_from: - /engine/installation/oracle/ - /engine/installation/linux/oracle/ +- /engine/installation/linux/docker-ee/oracle/ title: Get Docker EE for Oracle Linux toc_max: 4 --- diff --git a/engine/installation/linux/docker-ee/rhel.md b/install/linux/docker-ee/rhel.md similarity index 98% rename from engine/installation/linux/docker-ee/rhel.md rename to install/linux/docker-ee/rhel.md index 7e4edca9cc..8e346715b2 100644 --- a/engine/installation/linux/docker-ee/rhel.md +++ b/install/linux/docker-ee/rhel.md @@ -5,6 +5,7 @@ redirect_from: - /engine/installation/rhel/ - /installation/rhel/ - /engine/installation/linux/rhel/ +- /engine/installation/linux/docker-ee/rhel/ title: Get Docker EE for Red Hat Enterprise Linux toc_max: 4 --- diff --git a/engine/installation/linux/docker-ee/suse.md b/install/linux/docker-ee/suse.md similarity index 99% rename from engine/installation/linux/docker-ee/suse.md rename to install/linux/docker-ee/suse.md index cb2759f959..7cb43aa926 100644 --- a/engine/installation/linux/docker-ee/suse.md +++ b/install/linux/docker-ee/suse.md @@ -4,6 +4,7 @@ keywords: requirements, apt, installation, suse, opensuse, sles, rpm, install, u redirect_from: - /engine/installation/SUSE/ - /engine/installation/linux/suse/ +- /engine/installatioin/linux/docker-ee/suse/ title: Get Docker EE for SLES toc_max: 4 --- @@ -426,6 +427,6 @@ You must delete any edited configuration files manually. ## Next steps -- Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue with the [User Guide](/engine/userguide/index.md). diff --git a/engine/installation/linux/docker-ee/ubuntu.md b/install/linux/docker-ee/ubuntu.md similarity index 97% rename from engine/installation/linux/docker-ee/ubuntu.md rename to install/linux/docker-ee/ubuntu.md index 29ba4f7540..4d0271dfd7 100644 --- a/engine/installation/linux/docker-ee/ubuntu.md +++ b/install/linux/docker-ee/ubuntu.md @@ -5,6 +5,7 @@ redirect_from: - /engine/installation/ubuntulinux/ - /installation/ubuntulinux/ - /engine/installation/linux/ubuntulinux/ +- /engine/installation/linux/docker-ee/ubuntu/ title: Get Docker EE for Ubuntu toc_max: 4 --- @@ -16,7 +17,7 @@ To get started with Docker EE on Ubuntu, make sure you ## Prerequisites Docker CE users should go to -[Get Docker CE for Ubuntu](/engine/installation/linux/docker-ce/ubuntu.md) +[Get Docker CE for Ubuntu](/install/linux/docker-ce/ubuntu.md) **instead of this topic**. To install Docker Enterprise Edition (Docker EE), you need to know the Docker EE @@ -329,7 +330,7 @@ a new file each time you want to upgrade Docker EE. Docker EE is installed and running. The `docker` group is created but no users are added to it. You need to use `sudo` to run Docker -commands. Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) +commands. Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. @@ -358,6 +359,6 @@ You must delete any edited configuration files manually. ## Next steps -- Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md). +- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md). - Continue with the [User Guide](/engine/userguide/index.md). diff --git a/engine/installation/linux/linux-postinstall.md b/install/linux/linux-postinstall.md similarity index 98% rename from engine/installation/linux/linux-postinstall.md rename to install/linux/linux-postinstall.md index 55ed934799..a8a828917f 100644 --- a/engine/installation/linux/linux-postinstall.md +++ b/install/linux/linux-postinstall.md @@ -4,6 +4,7 @@ keywords: Docker, Docker documentation, requirements, apt, installation, ubuntu, title: Post-installation steps for Linux redirect_from: - /engine/installation/linux/docker-ee/linux-postinstall/ +- /engine/installation/linux/linux-postinstall/ --- @@ -354,8 +355,8 @@ system down more. ```xml - [ -i zt0 -j ACCEPT ] - [ -o zt0 -j ACCEPT ] + [ -i zt0 -j ACCEPT ] + [ -o zt0 -j ACCEPT ] ``` diff --git a/engine/installation/linux/ubuntu.md b/install/linux/ubuntu.md similarity index 51% rename from engine/installation/linux/ubuntu.md rename to install/linux/ubuntu.md index 5621caa518..2cbe4c29a3 100644 --- a/engine/installation/linux/ubuntu.md +++ b/install/linux/ubuntu.md @@ -1,11 +1,13 @@ --- description: Ubuntu installation landing page title: Choose Docker CE or Docker EE on Ubuntu +redirect_from: +- /engine/installation/linux/ubuntu/ --- The instructions for installing Docker on Ubuntu depend on whether you are using Docker Enterprise Edition (Docker EE) or Docker Community Edition (Docker CE). -[Learn more about Docker EE and Docker CE](/engine/installation/). +[Learn more about Docker EE and Docker CE](/install/index.md). -- [Install Docker EE on Ubuntu](/engine/installation/linux/docker-ee/ubuntu.md) -- [Install Docker CE on Ubuntu](/engine/installation/linux/docker-ce/ubuntu.md) +- [Install Docker EE on Ubuntu](/install/linux/docker-ee/ubuntu.md) +- [Install Docker CE on Ubuntu](/install/linux/docker-ce/ubuntu.md) diff --git a/engine/installation/windows/docker-ee.md b/install/windows/docker-ee.md similarity index 93% rename from engine/installation/windows/docker-ee.md rename to install/windows/docker-ee.md index 3c7574ef6e..8c75ba20cf 100644 --- a/engine/installation/windows/docker-ee.md +++ b/install/windows/docker-ee.md @@ -4,6 +4,7 @@ keywords: Windows, Windows Server, install, download, ucp, Docker EE title: Install Docker Enterprise Edition for Windows Server redirect_from: - /docker-ee-for-windows/install/ +- /engine/installation/windows/docker-ee/ --- {% capture filename %}{{ page.win_latest_build }}.zip{% endcapture %} @@ -17,7 +18,7 @@ This topic describes pre-install considerations, and how to download and install Docker EE. >**Looking for Release Notes?** [Get release notes for all -versions here](https://docs.docker.com/release-notes/) or subscribe to the +versions here](/release-notes/) or subscribe to the [releases feed on the Docker Blog](http://blog.docker.com/category/engineering/docker-releases/). ## Docker Universal Control Plane and Windows @@ -68,7 +69,9 @@ full list of prerequisites. ### (optional) Make sure you have all required updates -Some advanced Docker features (like Swarm) require that Windows is updated to include the fixes in [KB4015217](https://support.microsoft.com/en-us/help/4015217/windows-10-update-kb4015217) (or a later cumulative patch). +Some advanced Docker features, such as swarm mode, require the fixes included in +[KB4015217](https://support.microsoft.com/en-us/help/4015217/windows-10-update-kb4015217) +(or a later cumulative patch). ```PowerShell sconfig @@ -129,7 +132,8 @@ installs, or install on air-gapped systems. ## Install a specific version -To install a specific Docker version, you can use the `MaximumVersion`,`MinimumVersion` or 'RequiredVersion' flags. For example: +To install a specific Docker version, you can use the +`MaximumVersion`,`MinimumVersion` or 'RequiredVersion' flags. For example: ```PowerShell Install-Package -Name docker -ProviderName DockerProvider -Force -RequiredVersion 17.06.2-ee-5 @@ -168,7 +172,7 @@ Start-Service Docker * **What the Docker EE for Windows install includes**: The installation provides [Docker Engine](/engine/userguide/intro.md) and the -[Docker CLI client](https://docs.docker.com/engine/reference/commandline/cli/). +[Docker CLI client](/engine/reference/commandline/cli.md). ## About Docker EE containers and Windows Server diff --git a/install/windows/ee-preview.md b/install/windows/ee-preview.md new file mode 100644 index 0000000000..876b1c0ece --- /dev/null +++ b/install/windows/ee-preview.md @@ -0,0 +1,59 @@ +--- +description: How to install Docker on Windows Server 1709 and Windows 10 Fall Creators Update +keywords: Windows, Windows Server, install, download, Docker EE, preview, Windows 1709 +title: Preview Docker for Windows Server 1709 and Windows 10 Fall Creators Update +redirect_from: +- /engine/installation/windows/ee-preview/ +--- + +Windows versions released in the fall of 2017 (Windows Server 1709 and Windows +10 Fall Creators Update for server and client respectively) contain improvements +that improve the experience of running Docker on Windows. Enhancements include: + + * Docker ingress mode service publishing and virtual-IP based service discovery + * Mounting container-host named pipes into Windows containers + * Smaller Windows container base images + * Linux containers on Windows + +Check out the +[blog post announcement for details](https://blog.docker.com/2017/09/docker-windows-server-1709/) +on use-cases for these new features. + +## Windows 10 Fall Creators Update + +Windows 10 users can take advantage of the new Windows features by +[installing Docker CE _Edge_ for Windows 10](/docker-for-windows/install/). Edge +comes with the latest Docker platform builds that support the new Windows features. + +## Windows Server 1709 + +The latest version of Docker Enterprise Edition Basic is 17.06 and Docker EE +17.06 is the recommended way to run Docker containers on Windows Server 1709 in +production. Unfortunately, Docker Universal Control plane does not support +managing Windows Server 1709 workers yet. Only Docker EE Basic is supported on +Windows Server 1709. + +Docker EE 17.06 does not support improved networking (ingress and virtual-IP +based service discovery), named pipe mounting nor Linux containers on Windows +Server 1709 (it does benefit from the smaller base images). For users that want +to test these new Windows features with Docker, Docker Inc. makes available +preview builds of Docker EE. These can be installed from the `preview` channel +using the standard PowerShell installation method: + + Install-Module DockerProvider + Install-Package Docker -ProviderName DockerProvider -RequiredVersion preview + +Again, Docker Universal Control Plane does not work on Windows Server 1709 +whether running Docker EE 17.06 or Docker EE preview. + +## FAQ + +### Image compatibility + +Windows container base images are not compatible between Windows Server 2016 and +Windows Server 1709 (except that Windows Server 1709 can run Windows Server 2016 +based images when using Hyper-V isolation - but not the other way around). Check +the following Microsoft compatibility docs for details. + +- [Version compatibility](https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility) +- [System requirements](https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/system-requirements) diff --git a/opensource/index.md b/opensource/index.md index de4f316808..edbc349586 100644 --- a/opensource/index.md +++ b/opensource/index.md @@ -51,7 +51,7 @@ There are many ways to contribute: - Edit, rate, or file an issue or question directly on the site by using the links available on the right-side menu on every page -at [docs.docker.com](https://docs.docker.com/). +at [docs.docker.com](/). ![Docs feedback links](images/docs-site-feedback.png) @@ -90,7 +90,7 @@ To learn more about working on the documentation, see these topics: - [README on docker/docker.github.io](https://github.com/docker/docker.github.io/blob/master/README.md) -- [Docs Test page](https://docs.docker.com/test/) - This is on the +- [Docs Test page](/test.md) - This is on the published site. It explains how to use Docs components, resources, and formats, and gives us a way to test and demo them. diff --git a/swarm/install-manual.md b/swarm/install-manual.md index c34e67b491..02cbe47056 100644 --- a/swarm/install-manual.md +++ b/swarm/install-manual.md @@ -109,7 +109,7 @@ To create the instances do the following: ## Step 3. Install Engine on each node -1. [Install Docker](/engine/installation/){: target="_blank" class="_"} on each +1. [Install Docker](/install/){: target="_blank" class="_"} on each host, using the appropriate instructions for your operating system and distribution. diff --git a/test.md b/test.md index db886af7d4..c238a127c4 100644 --- a/test.md +++ b/test.md @@ -120,7 +120,7 @@ https://github.com/docker/docker.github.io/tree/master/docker-cloud/images from the URL, and use that as the link in your docs file. - Keep in mind that this link doesn't resolve until you merge the PR and - your docs are published on [docs.docker.com](https://docs.docker.com/). + your docs are published on [docs.docker.com](/). {: id="custom-target-id"} @@ -258,7 +258,7 @@ only need to do it on the first one. If you have a ``, set it there. The glossary source lives in the documentation repository [docker.github.io](https://github.com/docker/docker.github.io) in `_data/glossary.yaml`. The glossary publishes to -[https://docs.docker.com/glossary/](https://docs.docker.com/glossary/). +[https://docs.docker.com/glossary/](/glossary/). To update glossary content, edit `_data/glossary.yaml`.