docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

install page improvements, re-organization (#3767) 

* install page break out desktop, cloud, server, link updates

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed an on-page link

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-06-30 15:10:59 -07:00 committed by GitHub
parent 4854259ed2
commit fc17bb4da0
7 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_includes/docker_ce_ee.md
View File

@ -1,6 +1,6 @@
{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} {% 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}} | | 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}} | | Certified infrastructure, plugins and ISV containers | | {{green-check}} | {{green-check}} | {{green-check}} |

6
_includes/docker_cloud_matrix.md Normal file
View File

@ -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/) |

6
_includes/docker_desktop_matrix.md Normal file
View File

@ -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) | | |

16
_includes/docker_platform_matrix.md
View File

@ -2,15 +2,11 @@
{% assign install-prefix = '/engine/installation/linux' %} {% assign install-prefix = '/engine/installation/linux' %}
| Platform | Docker CE x86_64 | Docker CE ARM | Docker EE | | 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)| | [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)| | | | [Debian]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md)| [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | |
| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle.md)| | [Fedora]({{ install-prefix }}/docker-ce/fedora.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora.md)| |
| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse.md)| | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) |
| [Microsoft Windows Server 2016](/docker-ee-for-windows/install/) | | | [{{ green-check }}](/docker-ee-for-windows/install/) | | [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/) | | | | [Oracle Linux]({{ install-prefix }}/docker-ee/oracle.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle.md)|
| [macOS](/docker-for-mac/) | [{{ green-check }}](/docker-for-mac/) | | | | [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) |
| [Microsoft Azure](/docker-for-azure/) | [{{ green-check }}](/docker-for-azure/) | | [{{ green-check }}](/docker-for-azure/) | | [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse.md)| | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) |
| [Amazon Web Services](/docker-for-aws/) | [{{ green-check }}](/docker-for-aws/) | | [{{ green-check }}](/docker-for-aws/) | | [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)|

3
docker-cloud/infrastructure/link-aws.md
View File

@ -9,7 +9,8 @@ title: Link an Amazon Web Services account
> **Legacy instructions**: > **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 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 Docker Cloud can provision and manage **node clusters** and **nodes** on your

5
docker-cloud/infrastructure/link-azure.md
View File

@ -8,6 +8,11 @@ title: Link a Microsoft Azure account
notoc: true 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 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 **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 must link your Azure account so that Docker Cloud can interact with Azure on

22
engine/installation/index.md
View File

@ -37,13 +37,23 @@ including purchasing options, see
## Supported platforms ## Supported platforms
Docker CE and EE are available on multiple platforms, on cloud and on-premises. 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 %} {% 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 ## Time-based release schedule
Starting with Docker 17.03, Docker uses a time-based release schedule, outlined 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. 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) * [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) * [Packet setup guide](/docker-cloud/infrastructure/link-packet.md)
* [SoftLayer setup guide](/docker-cloud/infrastructure/link-softlayer.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) * [Use the Docker Cloud Agent to Bring your Own Host](/docker-cloud/infrastructure/byoh.md)