Skip to content

Commit

Permalink
Clean get Docker (docker#2581)
Browse files Browse the repository at this point in the history 
* Clean get Docker

* Fix deleted changes

* Align content to the left
  • Loading branch information
@joaofnfernandes
joaofnfernandes authored Apr 28, 2017
1 parent bebc8fb commit 2419c72
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 73 deletions.
9 changes: 9 additions & 0 deletions _includes/docker_ce_ee.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% 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 |
|:------------------------------------------------------------------|:------------------|:-------------------------|:----------------------------|:----------------------------|
| 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}} |
| Image management | | | {{green-check}} | {{green-check}} |
| Container app management | | | {{green-check}} | {{green-check}} |
| Image security scanning | | | | {{green-check}} |
31 changes: 15 additions & 16 deletions _includes/docker_platform_matrix.md
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{% capture green-check %}![yes](/engine/installation/images/green-check.svg){: style="height: 14px"}{% endcapture %}
{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}

| Platform | Docker EE | Docker CE x86_64 | Docker CE ARM |
| ---------------------------------------------------------------------------------------------------- | ----------------- | ----------------- | ----------------- |
| [Ubuntu](/engine/installation/linux/ubuntu.md) | {{ green-check }} | {{ green-check }} | {{ green-check }} |
| [Debian](/engine/installation/linux/debian.md) | | {{ green-check }} | {{ green-check }} |
| [Red Hat Enterprise Linux](/engine/installation/linux/rhel.md) | {{ green-check }} | | |
| [CentOS](/engine/installation/linux/centos.md) | {{ green-check }} | {{ green-check }} | |
| [Fedora](/engine/installation/linux/fedora.md) | | {{ green-check }} | |
| [Oracle Linux](/engine/installation/linux/oracle.md) | {{ green-check }} | | |
| [SUSE Linux Enterprise Server](/engine/installation/linux/suse.md) | {{ green-check }} | | |
| [Microsoft Windows Server 2016](/docker-ee-for-windows/install/) | {{ green-check }} | | |
| [Microsoft Windows 10](/docker-for-windows/) | | {{ green-check }} | |
| [macOS](/docker-for-mac/) | | {{ green-check }} | |
| [Microsoft Azure](/docker-for-azure/) | {{ green-check }} | {{ green-check }} | |
| [Amazon Web Services](/docker-for-aws/) | {{ green-check }} | {{ green-check }} | |
{: style="width: 75%" }
| Platform | Docker CE x86_64 | Docker CE ARM | Docker EE |
|:-------------------------------------------------------------------|:------------------|:------------------|:------------------|
| [Ubuntu](/engine/installation/linux/ubuntu.md) | {{ green-check }} | {{ green-check }} | {{ green-check }} |
| [Debian](/engine/installation/linux/debian.md) | {{ green-check }} | {{ green-check }} | |
| [Red Hat Enterprise Linux](/engine/installation/linux/rhel.md) | | | {{ green-check }} |
| [CentOS](/engine/installation/linux/centos.md) | {{ green-check }} | | {{ green-check }} |
| [Fedora](/engine/installation/linux/fedora.md) | {{ green-check }} | | |
| [Oracle Linux](/engine/installation/linux/oracle.md) | | | {{ green-check }} |
| [SUSE Linux Enterprise Server](/engine/installation/linux/suse.md) | | | {{ green-check }} |
| [Microsoft Windows Server 2016](/docker-ee-for-windows/install/) | | | {{ green-check }} |
| [Microsoft Windows 10](/docker-for-windows/) | {{ green-check }} | | |
| [macOS](/docker-for-mac/) | {{ green-check }} | | |
| [Microsoft Azure](/docker-for-azure/) | {{ green-check }} | | {{ green-check }} |
| [Amazon Web Services](/docker-for-aws/) | {{ green-check }} | | {{ green-check }} |
29 changes: 14 additions & 15 deletions _includes/docker_schedule_matrix.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@
{% capture superscript-link %}[1](#edge-footnote){: style="vertical-align: super; font-size: smaller;" }{% endcapture %}
{: style="width: 75%" }

| Month | Docker CE Edge | Docker CE Stable | Docker EE |
|----------|-------------------|-------------------|-------------------|
| January | {{ green-check }} | | |
| February | {{ green-check }} | | |
| March | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| April | {{ green-check }} | | |
| May | {{ green-check }} | | |
| June | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| July | {{ green-check }} | | |
| August | {{ green-check }} | | |
| September| {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| October | {{ green-check }} | | |
| November | {{ green-check }} | | |
| December | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| Month | Docker CE Edge | Docker CE Stable | Docker EE |
|:----------|:----------------------------------------|:------------------|:------------------|
| January | {{ green-check }} | | |
| February | {{ green-check }} | | |
| March | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| April | {{ green-check }} | | |
| May | {{ green-check }} | | |
| June | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| July | {{ green-check }} | | |
| August | {{ green-check }} | | |
| September | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| October | {{ green-check }} | | |
| November | {{ green-check }} | | |
| December | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |

`1`: On Linux distributions, these releases will only appear in the `stable`
channels, not the `edge` channels. For that reason, on Linux distributions,
you need to enable both channels.
{: id="edge-footnote" }

60 changes: 18 additions & 42 deletions engine/installation/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,48 +9,31 @@ redirect_from:
title: Install Docker
---

## Docker editions
Docker is available in two editions: **Community Edition (CE)** and **Enterprise
Edition (EE)**.

Docker is available in two editions:
Docker Community Edition (CE) is ideal for developers and small
teams looking to get started with Docker and experimenting with container-based
apps. Docker CE has two update channels, **stable** and **edge**:

- **Docker Enterprise Edition (Docker EE)** is designed for enterprise
development and IT teams who build, ship, and run business critical
applications in production at scale. Docker EE is integrated, certified, and
supported to provide enterprises with the most secure container platform in
the industry to modernize all applications. For more information
about Docker EE, including purchasing options, see
[Docker Enterprise Edition](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" }.
* **Stable** gives you reliable updates every quarter
* **Edge** gives you new features every month

- **Docker Community Edition (Docker CE)** is ideal for developers and small
teams looking to get started with Docker and experimenting with
container-based apps. Docker CE is available on many platforms, from desktop
to cloud to server. Docker CE is available for macOS and Windows and provides
a native experience to help you focus on learning Docker. You can build and
share containers and automate the development pipeline all from a single
environment.
For more information about Docker CE, see
[Docker Community Edition](https://www.docker.com/community-edition/){: target="_blank" class="_" }.

Docker CE has both **stable** and **edge** channels.
Docker Enterprise Edition (EE) is designed for enterprise
development and IT teams who build, ship, and run business critical
applications in production at scale. For more information about Docker EE,
including purchasing options, see
[Docker Enterprise Edition](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" }.

- **Stable** builds are released once per quarter and are supported for 4
months.
- **Edge** builds are released once per month, and are supported for that
month only. If you subscribe to the Edge channel on Linux distributions, you
should also subscribe to the Stable channel.
{% include docker_ce_ee.md %}

For more information about Docker CE, see
[Docker Community Edition](https://www.docker.com/community-edition/){: target="_blank" class="_" }.
## Supported platforms

- **Docker Cloud** is a platform run by Docker which allows you to deploy your
application using multiple cloud providers such as Digital Ocean, Packet,
SoftLink, or to bring your own device. For more information about using Docker
Cloud, see [Docker Cloud](#docker-cloud).

## Platform support matrix

Docker CE and Docker EE run on Linux, Cloud, Windows, and macOS platforms. Use
the following matrix to choose the best installation path for you. The links
under **Platform** take you straight to the installation instructions for that
platform.
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.

{% include docker_platform_matrix.md %}

Expand Down Expand Up @@ -80,13 +63,6 @@ You can use Docker Cloud to automatically provision and manage your cloud instan
* [SoftLayer setup guide](/docker-cloud/infrastructure/link-softlayer.md)
* [Use the Docker Cloud Agent to Bring your Own Host](/docker-cloud/infrastructure/byoh.md)

We also provide official Docker solutions for running on AWS and Azure. You can read
up on what Docker for AWS and Docker for Azure have to offer you
[here](/docker-for-aws/why/) and [here](/docker-for-azure/why/) respectively.

* [Docker for AWS](/docker-for-aws/)
* [Docker for Azure](/docker-for-azure/)

## Get started

After setting up Docker, try learning the basics over at
Expand Down

0 comments on commit 2419c72

Please sign in to comment.