From 3cd6cdc53b62c132a09ddbe62699cca6ac8a2594 Mon Sep 17 00:00:00 2001 From: Joao Fernandes Date: Tue, 1 May 2018 16:40:13 -0700 Subject: [PATCH] Refactor CE vs EE --- _data/toc.yaml | 249 ++++++++++++++-------------- _includes/docker_cloud_matrix.md | 15 -- _includes/docker_desktop_matrix.md | 6 - _includes/docker_platform_matrix.md | 27 --- docker-for-ibm-cloud.md | 5 +- ee/supported-platforms.md | 47 ++++-- install/index.md | 60 +++---- install/linux/centos.md | 13 -- install/linux/docker-ce/centos.md | 2 + install/linux/docker-ce/ubuntu.md | 2 + install/linux/ubuntu.md | 13 -- install/overview.md | 21 +++ 12 files changed, 219 insertions(+), 241 deletions(-) delete mode 100644 _includes/docker_cloud_matrix.md delete mode 100644 _includes/docker_desktop_matrix.md delete mode 100644 _includes/docker_platform_matrix.md delete mode 100644 install/linux/centos.md delete mode 100644 install/linux/ubuntu.md create mode 100644 install/overview.md diff --git a/_data/toc.yaml b/_data/toc.yaml index 370b08dc4f..f778218f18 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -18,123 +18,136 @@ horizontalnav: guides: - sectiontitle: Get Docker section: - - path: /install/ - title: Install Docker - - sectiontitle: Docker EE - section: - - path: /install/windows/docker-ee/ - title: Windows Server - - path: /install/linux/docker-ee/ubuntu/ - title: Ubuntu - - path: /install/linux/docker-ee/rhel/ - title: RHEL - - path: /install/linux/docker-ee/centos/ - title: CentOS - - path: /install/linux/docker-ee/oracle/ - title: Oracle Linux - - path: /install/linux/docker-ee/suse/ - title: SLES + - path: /install/overview/ + title: Overview of Docker editions - sectiontitle: Docker CE section: - - path: /docker-for-mac/install/ - title: Mac - - path: /docker-for-windows/install/ - title: Windows - - path: /install/linux/docker-ce/ubuntu/ - title: Ubuntu - - path: /install/linux/docker-ce/debian/ - title: Debian - - path: /install/linux/docker-ce/centos/ - title: CentOS - - path: /install/linux/docker-ce/fedora/ - title: Fedora - - path: /install/linux/docker-ce/binaries/ - title: Binaries - - sectiontitle: Platforms supporting Docker EE and Docker CE - section: - - path: /install/linux/centos/ - title: CentOS - - path: /install/linux/ubuntu/ - title: Ubuntu - - path: /install/linux/linux-postinstall/ - title: Optional Linux post-installation steps - - sectiontitle: Docker Edge - section: - - path: /edge/ - title: Overview - - path: /edge/engine/reference/commandline/docker/ - title: Docker Edge CLI reference - nosync: true - - sectiontitle: Docker for AWS - section: - - path: /docker-for-aws/why/ - title: Why Docker for AWS? - - path: /docker-for-aws/ - title: Setup & prerequisites - - path: /docker-for-aws/iam-permissions/ - title: IAM permissions - - path: /docker-for-aws/scaling/ - title: Scaling - - path: /docker-for-aws/upgrade/ - title: Upgrading - - path: /docker-for-aws/deploy/ - title: Deploy your app - - path: /docker-for-aws/persistent-data-volumes/ - title: Persistent data volumes - - path: /docker-for-aws/load-balancer/ - title: Load balancer - - path: /docker-for-aws/faqs/ - title: FAQs - - path: /docker-for-aws/opensource/ - title: Open source licensing - - path: /docker-for-aws/release-notes/ - title: Release notes - - path: /docker-for-aws/archive/ - title: Template archive - - sectiontitle: Docker for Azure - section: - - path: /docker-for-azure/why/ - title: Why Docker for Azure? - - path: /docker-for-azure/ - title: Setup & prerequisites - - path: /docker-for-azure/upgrade/ - title: Upgrading - - path: /docker-for-azure/deploy/ - title: Deploy your app - - path: /docker-for-azure/persistent-data-volumes/ - title: Persistent data volumes - - path: /docker-for-azure/faqs/ - title: FAQs - - path: /docker-for-azure/opensource/ - title: Open source licensing - - path: /docker-for-azure/release-notes/ - title: Release notes - - path: /docker-for-azure/archive/ - title: Template archive - - sectiontitle: Docker Toolbox (legacy) - section: - - path: /toolbox/overview/ - title: Toolbox overview - - path: /toolbox/toolbox_install_mac/ - title: Install Toolbox on Mac - - path: /toolbox/toolbox_install_windows/ - title: Install Toolbox on Windows - - sectiontitle: Kitematic + - title: About Docker CE + path: /install/ + - sectiontitle: Cloud section: - - path: /kitematic/userguide/ - title: "Kitematic user guide: intro & overview" - - path: /kitematic/nginx-web-server/ - title: Set up an Nginx web server - - path: /kitematic/minecraft-server/ - title: Set up a Minecraft Server - - path: /kitematic/rethinkdb-dev-database/ - title: Creating a local RethinkDB database for development - - path: /kitematic/faq/ - title: Frequently asked questions - - path: /kitematic/known-issues/ - title: Known issues - - path: /toolbox/faqs/troubleshoot/ - title: Troubleshooting + - sectiontitle: Docker for AWS + section: + - path: /docker-for-aws/why/ + title: Why Docker for AWS? + - path: /docker-for-aws/ + title: Setup & prerequisites + - path: /docker-for-aws/iam-permissions/ + title: IAM permissions + - path: /docker-for-aws/scaling/ + title: Scaling + - path: /docker-for-aws/upgrade/ + title: Upgrading + - path: /docker-for-aws/deploy/ + title: Deploy your app + - path: /docker-for-aws/persistent-data-volumes/ + title: Persistent data volumes + - path: /docker-for-aws/load-balancer/ + title: Load balancer + - path: /docker-for-aws/faqs/ + title: FAQs + - path: /docker-for-aws/opensource/ + title: Open source licensing + - path: /docker-for-aws/release-notes/ + title: Release notes + - path: /docker-for-aws/archive/ + title: Template archive + - sectiontitle: Docker for Azure + section: + - path: /docker-for-azure/why/ + title: Why Docker for Azure? + - path: /docker-for-azure/ + title: Setup & prerequisites + - path: /docker-for-azure/upgrade/ + title: Upgrading + - path: /docker-for-azure/deploy/ + title: Deploy your app + - path: /docker-for-azure/persistent-data-volumes/ + title: Persistent data volumes + - path: /docker-for-azure/faqs/ + title: FAQs + - path: /docker-for-azure/opensource/ + title: Open source licensing + - path: /docker-for-azure/release-notes/ + title: Release notes + - path: /docker-for-azure/archive/ + title: Template archive + - sectiontitle: Linux + section: + - path: /install/linux/docker-ce/centos/ + title: CentOS + - path: /install/linux/docker-ce/debian/ + title: Debian + - path: /install/linux/docker-ce/fedora/ + title: Fedora + - path: /install/linux/docker-ce/ubuntu/ + title: Ubuntu + - path: /install/linux/docker-ce/binaries/ + title: Binaries + - path: /install/linux/linux-postinstall/ + title: Optional Linux post-installation steps + - title: MacOS + path: /docker-for-mac/install/ + nosync: true + - title: Microsoft Windows + path: /docker-for-windows/install/ + nosync: true + - sectiontitle: Docker CE Edge releases + section: + - path: /edge/ + title: Overview + - path: /edge/engine/reference/commandline/docker/ + title: Docker Edge CLI reference + nosync: true + - sectiontitle: Docker Toolbox (legacy) + section: + - path: /toolbox/overview/ + title: Toolbox overview + - path: /toolbox/toolbox_install_mac/ + title: Install Toolbox on Mac + - path: /toolbox/toolbox_install_windows/ + title: Install Toolbox on Windows + - sectiontitle: Kitematic + section: + - path: /kitematic/userguide/ + title: "Kitematic user guide: intro & overview" + - path: /kitematic/nginx-web-server/ + title: Set up an Nginx web server + - path: /kitematic/minecraft-server/ + title: Set up a Minecraft Server + - path: /kitematic/rethinkdb-dev-database/ + title: Creating a local RethinkDB database for development + - path: /kitematic/faq/ + title: Frequently asked questions + - path: /kitematic/known-issues/ + title: Known issues + - path: /toolbox/faqs/troubleshoot/ + title: Troubleshooting + - title: Release notes + path: /release-notes/docker-ce/ + nosync: true + - sectiontitle: Docker EE + section: + - title: About Docker EE + path: /ee/supported-platforms/ + nosync: true + - sectiontitle: Linux + section: + - path: /install/linux/docker-ee/centos/ + title: CentOS + - path: /install/linux/docker-ee/oracle/ + title: Oracle Linux + - path: /install/linux/docker-ee/rhel/ + title: RHEL + - path: /install/linux/docker-ee/suse/ + title: SLES + - path: /install/linux/docker-ee/ubuntu/ + title: Ubuntu + - path: /install/windows/docker-ee/ + title: Microsoft Windows Server + - title: Release notes + path: /ee/engine/release-notes/ + nosync: true - sectiontitle: Compatibility between Docker versions section: - path: /engine/migration/ @@ -145,14 +158,6 @@ guides: title: Deprecated Docker features - path: /engine/faq/ title: FAQ - - sectiontitle: Release notes - section: - - path: /ee/engine/release-notes/ - title: Docker EE - nosync: true - - path: /release-notes/docker-ce/ - title: Docker CE - nosync: true - sectiontitle: Get started section: - sectiontitle: Get started with Docker diff --git a/_includes/docker_cloud_matrix.md b/_includes/docker_cloud_matrix.md deleted file mode 100644 index 17bd206bd4..0000000000 --- a/_includes/docker_cloud_matrix.md +++ /dev/null @@ -1,15 +0,0 @@ -{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} -{% assign install-prefix = '/install/linux' %} - -Docker Certified Infrastructure is Docker’s prescriptive approach to deploying -Docker Enterprise Edition (EE) on a range of infrastructure choices. Each Docker -Certified Infrastructure includes a reference architecture, automation templates, -and 3rd party ecosystem solution briefs, equipping you to automate and reliably -deploy Docker EE as well as simplifying lifecycle management of our platform. - -| Platform | Docker Enterprise Edition | Docker Community Edition | -|:--------------------|:------------------------------------------------------------------------------------------------:|:---------------------------------------:| -| VMware | [{{ green-check }}](https://success.docker.com/article/certified-infrastructures-vmware-vsphere) | | -| Amazon Web Services | [{{ green-check }}](/docker-for-aws/) | [{{ green-check }}](/docker-for-aws/) | -| Microsoft Azure | [{{ green-check }}](/docker-for-azure/) | [{{ green-check }}](/docker-for-azure/) | -| IBM Cloud | Coming soon | | diff --git a/_includes/docker_desktop_matrix.md b/_includes/docker_desktop_matrix.md deleted file mode 100644 index b53504ca74..0000000000 --- a/_includes/docker_desktop_matrix.md +++ /dev/null @@ -1,6 +0,0 @@ -{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} -{% assign install-prefix = '/install/linux' %} -| Platform | Docker CE x86_64 | Docker CE ARM | Docker EE | -|:----------------------------------------------------------------------|:-------------------------------------------------------------|:--------------------------------------------------------------|:-------------------------------------------------------------| -| [Docker for Mac (macOS)](/docker-for-mac/install.md) | [{{ green-check }}](/docker-for-mac/install.md) | -| [Docker for Windows (Microsoft Windows 10)](/docker-for-windows/install.md) | [{{ green-check }}](/docker-for-windows/install.md) | | | diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md deleted file mode 100644 index c09fdc90b5..0000000000 --- a/_includes/docker_platform_matrix.md +++ /dev/null @@ -1,27 +0,0 @@ -{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} -{% assign install-prefix-ce = '/install/linux/docker-ce' %} -{% assign install-prefix-ee = '/install/linux/docker-ee' %} - -#### Docker EE - -| Platform | x86_64 / amd64 | IBM Power (ppc64le) | IBM Z (s390x) | -|:----------------------------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------| -| [CentOS]({{ install-prefix-ee }}/centos.md) | [{{ green-check }}]({{ install-prefix-ee }}/centos.md) | | | -| [Oracle Linux]({{ install-prefix-ee }}/oracle.md) | [{{ green-check }}]({{ install-prefix-ee }}/oracle.md) | | | -| [Red Hat Enterprise Linux]({{ install-prefix-ee }}/rhel.md) | [{{ green-check }}]({{ install-prefix-ee }}/rhel.md) | [{{ green-check }}]({{ install-prefix-ee }}/rhel.md) | [{{ green-check }}]({{ install-prefix-ee }}/rhel.md) | -| [SUSE Linux Enterprise Server]({{ install-prefix-ee }}/suse.md) | [{{ green-check }}]({{ install-prefix-ee }}/suse.md) | [{{ green-check }}]({{ install-prefix-ee }}/suse.md) | [{{ green-check }}]({{ install-prefix-ee }}/suse.md) | -| [Ubuntu]({{ install-prefix-ee }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ee }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ee }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ee }}/ubuntu.md) | -| [Microsoft Windows Server 2016](/install/windows/docker-ee.md) | [{{ green-check }}](/install/windows/docker-ee.md) | | | - -> Limitations for Docker EE on IBM Power architecture -> -> - Neither UCP managers nor workers are supported on IBM Power. - -#### Docker CE - -| Platform | x86_64 / amd64 | ARM | ARM64 / AARCH64 | IBM Power (ppc64le) | IBM Z (s390x) | -|:--------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------| -| [CentOS]({{ install-prefix-ce }}/centos.md) | [{{ green-check }}]({{ install-prefix-ce }}/centos.md) | | [{{ green-check }}]({{ install-prefix-ce }}/centos.md) | | | -| [Debian]({{ install-prefix-ce }}/debian.md) | [{{ green-check }}]({{ install-prefix-ce }}/debian.md) | [{{ green-check }}]({{ install-prefix-ce }}/debian.md) | [{{ green-check }}]({{ install-prefix-ce }}/debian.md) | | | -| [Fedora]({{ install-prefix-ce }}/fedora.md) | [{{ green-check }}]({{ install-prefix-ce }}/fedora.md) | | | | | -| [Ubuntu]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | diff --git a/docker-for-ibm-cloud.md b/docker-for-ibm-cloud.md index cdef50d6e6..4de47fb7a5 100644 --- a/docker-for-ibm-cloud.md +++ b/docker-for-ibm-cloud.md @@ -21,6 +21,5 @@ redirect_from: - /docker-for-ibm-cloud/why/ --- -Docker for IBM Cloud has been replaced by Docker Certified Infrastructure. - -{% include docker_cloud_matrix.md %} +Docker for IBM Cloud has been replaced by +[Docker Certified Infrastructure](/ee/supported-platforms.md). diff --git a/ee/supported-platforms.md b/ee/supported-platforms.md index ec960d5ce4..759d4b41b9 100644 --- a/ee/supported-platforms.md +++ b/ee/supported-platforms.md @@ -4,6 +4,8 @@ description: Information about Docker Enterprise Edition Platform 2.0 keywords: enterprise, enterprise edition, ee, docker ee, docker enterprise edition, lts, commercial, cs engine redirect_from: - /enterprise/supported-platforms/ +green-check: '![yes](/install/images/green-check.svg){: style="height: 14px; margin:auto;"}' +install-prefix-ee: '/install/linux/docker-ee' --- Docker Enterprise Edition (*Docker EE*) is designed for enterprise @@ -16,8 +18,9 @@ options, see [Docker Enterprise Edition](https://www.docker.com/enterprise-editi

-The free Docker products continue to be available as the Docker Community -Edition (*Docker CE*). +## Docker EE tiers + +{% include docker_ce_ee.md %} ## Supported platforms @@ -27,20 +30,38 @@ instructions for the corresponding platform. Docker EE is an integrated, supported, and certified container platform for the listed cloud providers and operating systems. -{% include docker_platform_matrix.md %} -## Docker EE feature tiers +### On-premise -Docker EE is available in three tiers: +These are the operating systems where you can install Docker EE. + +| Platform | x86_64 / amd64 | IBM Power (ppc64le) | IBM Z (s390x) | +|:---------------------------------------------------------------------|:----------------------:|:----------------------:|:----------------------:| +| [CentOS]({{ page.install-prefix-ee }}/centos.md) | {{ page.green-check }} | | | +| [Oracle Linux]({{ page.install-prefix-ee }}/oracle.md) | {{ page.green-check }} | | | +| [Red Hat Enterprise Linux]({{ page.install-prefix-ee }}/rhel.md) | {{ page.green-check }} | {{ page.green-check }} | {{ page.green-check }} | +| [SUSE Linux Enterprise Server]({{ page.install-prefix-ee }}/suse.md) | {{ page.green-check }} | {{ page.green-check }} | {{ page.green-check }} | +| [Ubuntu]({{ page.install-prefix-ee }}/ubuntu.md) | {{ page.green-check }} | {{ page.green-check }} | {{ page.green-check }} | +| [Microsoft Windows Server 2016](/install/windows/docker-ee.md) | {{ page.green-check }} | | | + +> Limitations on IBM Power architecture +> +> Neither UCP managers nor workers are supported on IBM Power. + +### Docker Certified Infrastructure + +Docker Certified Infrastructure is Docker’s prescriptive approach to deploying +Docker Enterprise Edition (EE) on a range of infrastructure choices. Each Docker +Certified Infrastructure includes a reference architecture, automation templates, +and third-party ecosystem solution briefs. + +| Platform | Docker Enterprise Edition | +|:----------------------------------------------------------------------------------------|:-------------------------:| +| [VMware](https://success.docker.com/article/certified-infrastructures-vmware-vsphere) | {{ page.green-check }} | +| [Amazon Web Services](https://success.docker.com/article/certified-infrastructures-aws) | {{ page.green-check }} | +| [Microsoft Azure](https://success.docker.com/article/certified-infrastructures-azure) | {{ page.green-check }} | +| IBM Cloud | Coming soon | -- **Basic:** The Docker platform for certified infrastructure, with support - from Docker Inc. and certified containers and plugins from Docker Store. -- **Standard:** Adds advanced image and container management, LDAP/AD user - integration, and role-based access control. Together, these features - comprise Docker Enterprise Edition. -- **Advanced:** Adds - [Docker Security Scanning](https://blog.docker.com/2016/05/docker-security-scanning/) - and continuous vulnerability monitoring. ## Docker Enterprise Edition release cycles diff --git a/install/index.md b/install/index.md index 24bbbb8106..97d64cb658 100644 --- a/install/index.md +++ b/install/index.md @@ -1,4 +1,5 @@ --- +title: About Docker CE description: Lists the installation methods keywords: docker, installation, install, docker ce, docker ee, docker editions, stable, edge redirect_from: @@ -13,46 +14,56 @@ redirect_from: - /engine/installation/linux/docker-ce/ - /engine/installation/linux/docker-ee/ - /engine/installation/ -title: Install Docker --- -Docker is available in two editions: **Community Edition (CE)** and **Enterprise -Edition (EE)**. - 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**: -* **Stable** gives you reliable updates every quarter -* **Edge** gives you new features every month +* **Stable** gives you reliable updates every quarter. +* **Edge** gives you new features every month. For more information about Docker CE, see [Docker Community Edition](https://www.docker.com/community-edition/){: target="_blank" class="_" }. -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="_" }. - -{% include docker_ce_ee.md %} - ## Supported platforms -Docker CE and EE are available on multiple platforms, on cloud and on-premises. +Docker CE is available on multiple platforms, on cloud and on-premises. Use the following tables to choose the best installation path for you. ### Desktop -{% include docker_desktop_matrix.md %} +{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} -### Docker Certified Infrastructure +| Platform | x86_64 | +|:----------------------------------------------------------------------------|:-----------------:| +| [Docker for Mac (macOS)](/docker-for-mac/install.md) | {{ green-check }} | +| [Docker for Windows (Microsoft Windows 10)](/docker-for-windows/install.md) | {{ green-check }} | + + +### Cloud + +{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} + + +| Platform | Docker Community Edition | +|:----------------------------------------|:------------------------:| +| [Amazon Web Services](/docker-for-aws/) | {{ green-check }} | +| [Microsoft Azure](/docker-for-azure/) | {{ green-check }} | -{% include docker_cloud_matrix.md %} ### Server -{% include docker_platform_matrix.md %} +{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} +{% assign install-prefix-ce = '/install/linux/docker-ce' %} + +| Platform | x86_64 / amd64 | ARM | ARM64 / AARCH64 | IBM Power (ppc64le) | IBM Z (s390x) | +|:--------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------|:-------------------------------------------------------| +| [CentOS]({{ install-prefix-ce }}/centos.md) | [{{ green-check }}]({{ install-prefix-ce }}/centos.md) | | [{{ green-check }}]({{ install-prefix-ce }}/centos.md) | | | +| [Debian]({{ install-prefix-ce }}/debian.md) | [{{ green-check }}]({{ install-prefix-ce }}/debian.md) | [{{ green-check }}]({{ install-prefix-ce }}/debian.md) | [{{ green-check }}]({{ install-prefix-ce }}/debian.md) | | | +| [Fedora]({{ install-prefix-ce }}/fedora.md) | [{{ green-check }}]({{ install-prefix-ce }}/fedora.md) | | | | | +| [Ubuntu]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix-ce }}/ubuntu.md) | + ## Time-based release schedule @@ -61,24 +72,15 @@ Starting with Docker 17.03, Docker uses a time-based release schedule. - Docker CE Edge releases generally happen monthly. - Docker CE Stable releases generally happen quarterly, with patch releases as needed. -- Docker EE releases generally happen twice per year, with patch releases as - needed. ### Updates, and patches -- A given Docker EE release receives patches and updates for at least **one - year** after it is released. - A given Docker CE Stable release receives patches and updates for **one month after the next Docker CE Stable release**. - A given Docker CE Edge release does not receive any patches or updates after a subsequent Docker CE Edge or Stable release. -### Prior releases - -Instructions for installing prior releases of Docker can be found in the -[Docker archives](/docsarchive/). - ## Get started -After setting up Docker, try learning the basics over at +After setting up Docker, you can learn the basics over at [Getting started with Docker](/get-started/). diff --git a/install/linux/centos.md b/install/linux/centos.md deleted file mode 100644 index b97808f03a..0000000000 --- a/install/linux/centos.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -description: CentOS installation landing page -title: Choose Docker CE or Docker EE on CentOS -redirect_from: -- /engine/installation/linux/centos/ ---- - -The instructions for installing Docker on CentOS depend on whether you are using -Docker Enterprise Edition (Docker EE) or Docker Community Edition (Docker CE). -[Learn more about Docker EE and Docker CE](/install/index.md). - -- [Install Docker EE on CentOS](/install/linux/docker-ee/centos.md) -- [Install Docker CE on CentOS](/install/linux/docker-ce/centos.md) diff --git a/install/linux/docker-ce/centos.md b/install/linux/docker-ce/centos.md index b7a6a5bae3..77e410bbfe 100644 --- a/install/linux/docker-ce/centos.md +++ b/install/linux/docker-ce/centos.md @@ -4,6 +4,8 @@ keywords: requirements, apt, installation, centos, rpm, install, uninstall, upgr redirect_from: - /engine/installation/centos/ - /engine/installation/linux/docker-ce/centos/ +- /install/linux/centos/ +- /engine/installation/linux/centos/ title: Get Docker CE for CentOS toc_max: 4 --- diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index 0bc9b66302..4048aa6fa0 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -6,6 +6,8 @@ redirect_from: - /installation/ubuntulinux/ - /engine/installation/linux/ubuntulinux/ - /engine/installation/linux/docker-ce/ubuntu/ +- /install/linux/ubuntu/ +- /engine/installation/linux/ubuntu/ title: Get Docker CE for Ubuntu toc_max: 4 --- diff --git a/install/linux/ubuntu.md b/install/linux/ubuntu.md deleted file mode 100644 index 2cbe4c29a3..0000000000 --- a/install/linux/ubuntu.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -description: Ubuntu installation landing page -title: Choose Docker CE or Docker EE on Ubuntu -redirect_from: -- /engine/installation/linux/ubuntu/ ---- - -The instructions for installing Docker on Ubuntu depend on whether you are using -Docker Enterprise Edition (Docker EE) or Docker Community Edition (Docker CE). -[Learn more about Docker EE and Docker CE](/install/index.md). - -- [Install Docker EE on Ubuntu](/install/linux/docker-ee/ubuntu.md) -- [Install Docker CE on Ubuntu](/install/linux/docker-ce/ubuntu.md) diff --git a/install/overview.md b/install/overview.md new file mode 100644 index 0000000000..cd5cf46e4c --- /dev/null +++ b/install/overview.md @@ -0,0 +1,21 @@ +--- +title: Overview of Docker editions +description: Learn about the two Docker editions available, Docker Enterprise + Edition, and Docker Community Edition. +keywords: editions, ee, ce, +green-check: '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' +--- + +Docker is available in two editions: +* Community Edition (CE) +* Enterprise Edition (EE) + +Docker Community Edition (CE) is ideal for individual developers and small teams +looking to get started with Docker and experimenting with container-based apps. + +Docker Enterprise Edition (EE) is designed for enterprise development and IT +teams who build, ship, and run business critical applications in production at +scale. + + +{% include docker_ce_ee.md %}