From 9524bfee674f8c7e4809d7f86f9c18dfd1171402 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Wed, 7 Feb 2018 15:09:20 -0800 Subject: [PATCH] Improve Docker server OS matrix --- _includes/docker_platform_matrix.md | 36 ++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md index 3ca0bfb2b9..8dcfaa9daa 100644 --- a/_includes/docker_platform_matrix.md +++ b/_includes/docker_platform_matrix.md @@ -1,16 +1,30 @@ {% 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 CE AARCH64 | Docker CE IBM Power (ppc64le) | Docker CE IBM Z (s390x) | Docker EE x86_64 | Docker EE IBM Power (ppc64le) | Docker EE IBM Z (s390x) | -|:---------------------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:---------------------------------------------------------------|:--------------------------------------------------------------|--------------------------------------------------------------| -| [CentOS]({{ install-prefix }}/centos.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos.md) | | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/centos.md) | | | -| [Debian]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | | | | | | -| [Fedora]({{ install-prefix }}/docker-ce/fedora.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora.md) | | | | | | | | -| [Microsoft Windows Server 2016](/install/windows/docker-ee.md) | | | | | | [{{ green-check }}](/install/windows/docker-ee.md) | | | -| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle.md) | | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle.md) | | | -| [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel.md) | | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | -| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse.md) | | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | -| [Ubuntu]({{ install-prefix }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md)| +{% assign install-prefix-ce = '/install/linux/docker-ee' %} +{% assign install-prefix-ee = '/install/linux/docker-ce' %} + +#### 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) | + + +