mirror of https://github.com/docker/docs.git
removed relationship btn CE and EE section
This commit is contained in:
parent
aedde78801
commit
e250bbdea5
|
|
@ -29,7 +29,7 @@ apps. Docker Engine - Community has three types of update channels, **stable**,
|
||||||
|
|
||||||
## Releases
|
## Releases
|
||||||
|
|
||||||
For the Docker Engine - Community engine, the open
|
For the Docker Engine - Community, the open
|
||||||
repositories [Docker Engine](https://github.com/docker/engine) and
|
repositories [Docker Engine](https://github.com/docker/engine) and
|
||||||
[Docker Client](https://github.com/docker/cli) apply.
|
[Docker Client](https://github.com/docker/cli) apply.
|
||||||
|
|
||||||
|
|
@ -97,14 +97,6 @@ Binaries built from this releases are available in the stable channel
|
||||||
`stable-YY.mm`, for example `stable-18.09`, as well as the corresponding
|
`stable-YY.mm`, for example `stable-18.09`, as well as the corresponding
|
||||||
test channel.
|
test channel.
|
||||||
|
|
||||||
### Relationship between Docker Engine - Community and Docker Engine - Enterprise code
|
|
||||||
|
|
||||||
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 Docker Engine - Enterprise, occasionally they will happen, and Docker will work hard to resolve them in a timely fashion.
|
|
||||||
|
|
||||||
## Next release
|
## Next release
|
||||||
|
|
||||||
The activity for upcoming year-month releases is tracked in the milestones
|
The activity for upcoming year-month releases is tracked in the milestones
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue