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

changing instances of CE and EE per issue 1168 

Signed-off-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
This commit is contained in:
Dawn W Docker 2019-06-13 07:52:55 -07:00
parent d2ff3110bd
commit d677f7ef5a
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
install/index.md
View File

@ -1,7 +1,7 @@
---
title: About Docker Engine - Community
description: Lists the installation methods
keywords: docker, installation, install, Docker Engine - Community, docker ee, docker editions, stable, edge
keywords: docker, installation, install, Docker Engine - Community, Docker Engine - Enterprise, docker editions, stable, edge
redirect_from:
- /installation/
- /engine/installation/linux/
@ -48,7 +48,7 @@ the `18.09` release. The patch releases for a year-month release take
place as needed to address bug fixes during its support cycle.
Docker Engine - Community binaries for a release are available on [download.docker.com](https://download.docker.com/)
as packages for the supported operating systems. Docker EE binaries are
as packages for the supported operating systems. Docker Engine - Enterprise binaries are
available on the [Docker Hub](https://hub.docker.com/) for the supported operating systems. The
release channels are available for each of the year-month releases and
allow users to "pin" on a year-month release of choice. The release
@ -98,18 +98,13 @@ Binaries built from this releases are available in the stable channel
`stable-YY.mm`, for example `stable-18.09`, as well as the corresponding
test channel.
### Relationship between Docker Engine - Community and EE code
### Relationship between Docker Engine - Community and Docker Engine - Enterprise code
For a given year-month release, Docker releases both Docker Engine - Community and EE
variants concurrently. EE is a superset of the code delivered in
CE. Docker maintains publicly visible repositories for the Docker Engine - Community code
as well as private repositories for the EE code. Automation (a bot)
is used to keep the branches between Docker Engine - Community and EE in sync so as features
and fixes are merged on the various branches in the Docker Engine - Community repositories
(upstream), the corresponding EE repositories and branches are kept
For a given year-month release, Docker releases both Docker Engine - Community and Docker Engine - Enterprise variants concurrently. Docker Engine - Enterprise is a superset of the code delivered in Docker Engine - Community. Docker maintains publicly visible repositories for the Docker Engine - Community code
as well as private repositories for the Docker Engine - Enterprise code. Automation (a bot) is used to keep the branches between Docker Engine - Community and Docker Engine - Enterprise in sync so as features
and fixes are merged on the various branches in the Docker Engine - Community repositories (upstream), the corresponding Docker Engine - Enterprise repositories and branches are kept
in sync (downstream). While Docker and its partners make every effort
to minimize merge conflicts between Docker Engine - Community and EE, occasionally they will
happen, and Docker will work hard to resolve them in a timely fashion.
to minimize merge conflicts between Docker Engine - Community and Docker Engine - Enterprise, occasionally they will happen, and Docker will work hard to resolve them in a timely fashion.
## Next release
@ -120,7 +115,7 @@ of the repository.
Docker Engine - Community releases of a year-month branch are supported with patches
as needed for 7 months after the first year-month general availability
release. Docker EE releases are supported for 24 months after the first
release. Docker Engine - Enterprise releases are supported for 24 months after the first
year-month general availability release.
This means bug reports and backports to release branches are assessed