mirror of https://github.com/docker/docs.git
branding changes
Signed-off-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
This commit is contained in:
parent
814fd93b21
commit
ceac042836
|
@ -1,10 +1,10 @@
|
|||
<!-- This file is included in Docker CE or EE installation docs for Linux. -->
|
||||
<!-- This file is included in Docker Engine - Community or EE installation docs for Linux. -->
|
||||
|
||||
### Install using the convenience script
|
||||
|
||||
Docker provides convenience scripts at [get.docker.com](https://get.docker.com/)
|
||||
and [test.docker.com](https://test.docker.com/) for installing edge and
|
||||
testing versions of Docker CE into development environments quickly and
|
||||
testing versions of Docker Engine - Community into development environments quickly and
|
||||
non-interactively. The source code for the scripts is in the
|
||||
[`docker-install` repository](https://github.com/docker/docker-install).
|
||||
**Using these scripts is not recommended for production
|
||||
|
@ -27,7 +27,7 @@ them:
|
|||
host machine using another mechanism.
|
||||
|
||||
This example uses the script at [get.docker.com](https://get.docker.com/) to
|
||||
install the latest release of Docker CE on Linux. To install the latest
|
||||
install the latest release of Docker Engine - Community on Linux. To install the latest
|
||||
testing version, use [test.docker.com](https://test.docker.com/) instead. In
|
||||
each of the commands below, replace each occurrence of `get` with `test`.
|
||||
|
||||
|
@ -61,7 +61,7 @@ Remember to log out and back in for this to take effect!
|
|||
> for more information.
|
||||
{:.warning}
|
||||
|
||||
Docker CE is installed. It starts automatically on `DEB`-based distributions. On
|
||||
Docker Engine - Community is installed. It starts automatically on `DEB`-based distributions. On
|
||||
`RPM`-based distributions, you need to start it manually using the appropriate
|
||||
`systemctl` or `service` command. As the message indicates, non-root users can't
|
||||
run Docker commands by default.
|
||||
|
|
|
@ -106,7 +106,7 @@ The number of workers you want in your swarm (0-1000).
|
|||
|
||||
##### ManagerSize
|
||||
|
||||
The number of managers in your swarm. On Docker CE, you can select either 1,
|
||||
The number of managers in your swarm. On Docker Engine - Community, you can select either 1,
|
||||
3 or 5 managers. We only recommend 1 manager for testing and dev setups. There
|
||||
are no failover guarantees with 1 manager — if the single manager fails the
|
||||
swarm goes down as well. Additionally, upgrading single-manager swarms is not
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
---
|
||||
title: Docker CE Edge documentation
|
||||
title: Docker Engine - Community Edge documentation
|
||||
description: Information about current Docker Edge releases
|
||||
keywords: engine, edge, installation
|
||||
---
|
||||
|
||||
> **The Docker CE Edge channel is deprecated in favor of nightly channel. See [About Docker CE](/install/index.md) for details on how to access the nightly channel.**
|
||||
> **The Docker Engine - Community Edge channel is deprecated in favor of nightly channel. See [About Docker Engine - Community](/install/index.md) for details on how to access the nightly channel.**
|
||||
|
||||
The latest Docker CE Stable release is **[{{ site.docker_ce_version }}](/engine/release-notes/)**.
|
||||
The latest Docker Engine - Community Stable release is **[{{ site.docker_ce_version }}](/engine/release-notes/)**.
|
||||
|
||||
Stable releases are not published to the Edge channel, so Linux repository users
|
||||
should subscribe to the Stable channels.
|
||||
|
||||
> Commercial support is not available for Docker CE. For information about all Docker release channels and expectations about support, see [About Docker CE](/install/index.md).
|
||||
> Commercial support is not available for Docker Engine - Community. For information about all Docker release channels and expectations about support, see [About Docker Engine - Community](/install/index.md).
|
||||
|
||||
### Docker CE resources
|
||||
### Docker Engine - Community resources
|
||||
|
||||
- [Docker CLI (docker) reference](/engine/reference/commandline/docker/)
|
||||
- [Docker Daemon CLI (dockerd) reference](/engine/reference/commandline/dockerd/)
|
||||
|
|
|
@ -9,17 +9,17 @@ The Docker Engine `18.09` release introduces a new feature called **CE-EE Node A
|
|||
CE-EE Node Activate will apply a license, and switch the Docker engine to the Enterprise engine binary.
|
||||
|
||||
## Requirements:
|
||||
* The Docker Community Edition (CE) version must be 18.09 or higher.
|
||||
* The Docker Engine - Community version must be 18.09 or higher.
|
||||
* All of the Docker packages must be installed: docker-cli, docker-server, and containerd.
|
||||
|
||||
## Limitations
|
||||
|
||||
* This feature is only supported on x86 Linux nodes.
|
||||
* Windows nodes are not currently supported.
|
||||
* Node-level Engine activation between CE and EE is only supported in the same version of Docker Enterprise Engine for Docker.
|
||||
* Prior versions of Docker CE do not support this feature.
|
||||
* Node-level Engine activation between Docker Engine - Community and EE is only supported in the same version of Docker Enterprise Engine for Docker.
|
||||
* Prior versions of Docker Engine - Community do not support this feature.
|
||||
|
||||
## Notes on patching after running CE to EE Node Activation
|
||||
## Notes on patching after running Docker Engine - Community to EE Node Activation
|
||||
|
||||
Docker recommends replacing the apt or yum repository from CE with the EE repository that appears
|
||||
on your hub/store account after starting the trial or paid license. This allows apt/yum
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
title: "Get Started, Part 6: Deploy your app"
|
||||
keywords: deploy, production, datacenter, cloud, aws, azure, provider, admin, enterprise
|
||||
description: Deploy your app to production using Docker CE or EE.
|
||||
description: Deploy your app to production using Docker Engine - Community or EE.
|
||||
---
|
||||
{% include_relative nav.html selected="6" %}
|
||||
|
||||
|
|
Loading…
Reference in New Issue