From fc17bb4da0e7502013e25c12cd6cdd44c1fc860d Mon Sep 17 00:00:00 2001 From: Victoria Bialas Date: Fri, 30 Jun 2017 15:10:59 -0700 Subject: [PATCH] install page improvements, re-organization (#3767) * install page break out desktop, cloud, server, link updates Signed-off-by: Victoria Bialas * fixed an on-page link Signed-off-by: Victoria Bialas --- _includes/docker_ce_ee.md | 2 +- _includes/docker_cloud_matrix.md | 6 ++++++ _includes/docker_desktop_matrix.md | 6 ++++++ _includes/docker_platform_matrix.md | 16 ++++++---------- docker-cloud/infrastructure/link-aws.md | 3 ++- docker-cloud/infrastructure/link-azure.md | 5 +++++ engine/installation/index.md | 22 ++++++++++++++++------ 7 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 _includes/docker_cloud_matrix.md create mode 100644 _includes/docker_desktop_matrix.md diff --git a/_includes/docker_ce_ee.md b/_includes/docker_ce_ee.md index a2e57f7c40..194b03c218 100644 --- a/_includes/docker_ce_ee.md +++ b/_includes/docker_ce_ee.md @@ -1,6 +1,6 @@ {% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} -| | Community Edition | Enterprise Edition Basic | Enterprise Edition Standard | Enterprise Edition Advanced | +| Capabilities | Community Edition | Enterprise Edition Basic | Enterprise Edition Standard | Enterprise Edition Advanced | |:------------------------------------------------------------------|:------------------|:-------------------------|:----------------------------|:----------------------------| | Container engine and built in orchestration, networking, security | {{green-check}} | {{green-check}} | {{green-check}} | {{green-check}} | | Certified infrastructure, plugins and ISV containers | | {{green-check}} | {{green-check}} | {{green-check}} | diff --git a/_includes/docker_cloud_matrix.md b/_includes/docker_cloud_matrix.md new file mode 100644 index 0000000000..f4cefef08c --- /dev/null +++ b/_includes/docker_cloud_matrix.md @@ -0,0 +1,6 @@ +{% 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 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/) | diff --git a/_includes/docker_desktop_matrix.md b/_includes/docker_desktop_matrix.md new file mode 100644 index 0000000000..055fd0c936 --- /dev/null +++ b/_includes/docker_desktop_matrix.md @@ -0,0 +1,6 @@ +{% 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 EE | +|:----------------------------------------------------------------------|:-------------------------------------------------------------|:--------------------------------------------------------------|:-------------------------------------------------------------| +| [Docker for Mac (macOS)](/docker-for-mac/install.md) | [{{ green-check }}](/docker-for-mac/install.md) | +| [Docker for Windows (Microsoft Windows 10)](/docker-for-windows/install.md) | [{{ green-check }}](/docker-for-windows/install.md) | | | diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md index b3ffa2698f..0a276b44af 100644 --- a/_includes/docker_platform_matrix.md +++ b/_includes/docker_platform_matrix.md @@ -2,15 +2,11 @@ {% assign install-prefix = '/engine/installation/linux' %} | Platform | Docker CE x86_64 | Docker CE ARM | Docker EE | |:----------------------------------------------------------------------|:-------------------------------------------------------------|:--------------------------------------------------------------|:-------------------------------------------------------------| -| [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-ee/ubuntu.md)| -| [Debian]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md)| [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | | -| [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | | [CentOS]({{ install-prefix }}/centos.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos.md)| | [{{ green-check }}]({{ install-prefix }}/docker-ee/centos.md)| -| [Fedora]({{ install-prefix }}/docker-ce/fedora.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora.md)| | | -| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle.md)| -| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse.md)| | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.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](/docker-ee-for-windows/install/) | | | [{{ green-check }}](/docker-ee-for-windows/install/) | -| [Microsoft Windows 10](/docker-for-windows/) | [{{ green-check }}](/docker-for-windows/) | | | -| [macOS](/docker-for-mac/) | [{{ green-check }}](/docker-for-mac/) | | | -| [Microsoft Azure](/docker-for-azure/) | [{{ green-check }}](/docker-for-azure/) | | [{{ green-check }}](/docker-for-azure/) | -| [Amazon Web Services](/docker-for-aws/) | [{{ green-check }}](/docker-for-aws/) | | [{{ green-check }}](/docker-for-aws/) | +| [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) | +| [SUSE Linux Enterprise Server]({{ 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-ee/ubuntu.md)| diff --git a/docker-cloud/infrastructure/link-aws.md b/docker-cloud/infrastructure/link-aws.md index 7eb7d291d7..641b6b36d0 100644 --- a/docker-cloud/infrastructure/link-aws.md +++ b/docker-cloud/infrastructure/link-aws.md @@ -9,7 +9,8 @@ title: Link an Amazon Web Services account > **Legacy instructions**: > -> This topic has been superseded by [the AWS instructions that enable swarm mode](/docker-cloud/cloud-swarm/link-aws-swarm/). +> This topic has been superseded by [the AWS instructions that enable swarm mode](/docker-cloud/cloud-swarm/link-aws-swarm.md). +{: .note-vanilla} You can create a role with AWS IAM (Identity and Access Management) so that Docker Cloud can provision and manage **node clusters** and **nodes** on your diff --git a/docker-cloud/infrastructure/link-azure.md b/docker-cloud/infrastructure/link-azure.md index 9cfd727014..8e36e16646 100644 --- a/docker-cloud/infrastructure/link-azure.md +++ b/docker-cloud/infrastructure/link-azure.md @@ -8,6 +8,11 @@ title: Link a Microsoft Azure account notoc: true --- +> **Legacy instructions**: +> +> This topic has been superseded by [the Azure instructions that enable swarm mode](/docker-cloud/cloud-swarm/link-azure-swarm.md). +{: .note-vanilla} + You can link your Microsoft Azure account to your Docker Cloud account to deploy **nodes** and **node clusters** using Docker Cloud's Dashboard, API, or CLI. You must link your Azure account so that Docker Cloud can interact with Azure on diff --git a/engine/installation/index.md b/engine/installation/index.md index 98d35fc82b..609e02f409 100644 --- a/engine/installation/index.md +++ b/engine/installation/index.md @@ -37,13 +37,23 @@ including purchasing options, see ## Supported platforms Docker CE and EE are available on multiple platforms, on cloud and on-premises. -Use the following matrix to choose the best installation path for you. +Use the following tables to choose the best installation path for you. + +### Desktop + +{% include docker_desktop_matrix.md %} + +### Cloud + +{% include docker_cloud_matrix.md %} + +See also [Docker Cloud](#docker-cloud) for setup instructions for +Digital Ocean, Packet, SoftLink, or Bring Your Own Cloud. + +### Server {% include docker_platform_matrix.md %} -See also [Docker Cloud](#on-docker-cloud) for setup instructions for -Digital Ocean, Packet, SoftLink, or Bring Your Own Cloud. - ## Time-based release schedule Starting with Docker 17.03, Docker uses a time-based release schedule, outlined @@ -60,9 +70,9 @@ Instructions for installing prior releases of Docker can be found in the You can use Docker Cloud to automatically provision and manage your cloud instances. -* [Amazon Web Services setup guide](/docker-cloud/infrastructure/link-aws.md) +* [Amazon Web Services setup guide](/docker-cloud/cloud-swarm/link-aws-swarm.md) +* [Microsoft Azure setup guide](/docker-cloud/cloud-swarm/link-azure-swarm.md) * [DigitalOcean setup guide](/docker-cloud/infrastructure/link-do.md) -* [Microsoft Azure setup guide](/docker-cloud/infrastructure/link-azure.md) * [Packet setup guide](/docker-cloud/infrastructure/link-packet.md) * [SoftLayer setup guide](/docker-cloud/infrastructure/link-softlayer.md) * [Use the Docker Cloud Agent to Bring your Own Host](/docker-cloud/infrastructure/byoh.md)