Clarify re Edge releases

This commit is contained in:
Misty Stanley-Jones
2017-04-05 11:06:53 -07:00
committed by Misty Stanley-Jones
parent b3ca1d6120
commit d8c04e59b3
2 changed files with 18 additions and 12 deletions

View File

@@ -1,18 +1,24 @@
{% capture green-check %}![yes](/engine/installation/images/green-check.svg){: style="height: 14px"}{% endcapture %}
{% capture green-check %}![yes](/engine/installation/images/green-check.svg){: style="height: 14px; display: inline-block"}{% endcapture %}
{% 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 }} | {{ green-check }} |
| March | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| April | {{ green-check }} | | |
| May | {{ green-check }} | | |
| June | | {{ green-check }} | {{ green-check }} |
| June | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| July | {{ green-check }} | | |
| August | {{ green-check }} | | |
| September| | {{ green-check }} | {{ green-check }} |
| September| {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} |
| October | {{ green-check }} | | |
| November | {{ green-check }} | | |
| December | | {{ green-check }} | {{ 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" }

View File

@@ -31,10 +31,11 @@ Docker is available in two editions:
Docker CE has both **stable** and **edge** channels.
- **Stable** builds are released once per quarter.
- **Edge** builds are released once per month, except during the months that
Edge builds are released. If you subscribe to the Edge channel, you should
also subscribe to the Stable channel.
- **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.
For more information about Docker CE, see
[Docker Community Edition](https://www.docker.com/community-edition/){: target="_blank" class="_" }.
@@ -59,8 +60,7 @@ 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
below. For Docker CE Edge users, if you want to receive each month's release,
you need to subscribe to both the Edge and Stable channels.
below.
{% include docker_schedule_matrix.md %}