From be8fd5413df438a2abd81610b635d5fa274853f4 Mon Sep 17 00:00:00 2001 From: gbarr01 Date: Wed, 7 Feb 2018 09:37:56 -0800 Subject: [PATCH] Update packaging changes per 5844 --- _includes/docker_platform_matrix.md | 20 ++++++++++---------- install/linux/docker-ce/fedora.md | 1 - install/linux/docker-ce/ubuntu.md | 1 - 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md index 4bb200fac4..3ca0bfb2b9 100644 --- a/_includes/docker_platform_matrix.md +++ b/_includes/docker_platform_matrix.md @@ -1,15 +1,15 @@ {% 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 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-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) | | | | | | -| [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-ee/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md)| +| 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)| > Limitations for Docker EE on IBM Power architecture > diff --git a/install/linux/docker-ce/fedora.md b/install/linux/docker-ce/fedora.md index ea7a87ab0a..39dea255be 100644 --- a/install/linux/docker-ce/fedora.md +++ b/install/linux/docker-ce/fedora.md @@ -25,7 +25,6 @@ and distributions for different Docker editions, see To install Docker, you need the 64-bit version of one of these Fedora versions: -- 25 - 26 - 27 diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index fd3668e54a..2993c3869f 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -31,7 +31,6 @@ To install Docker CE, you need the 64-bit version of one of these Ubuntu versions: - Artful 17.10 (Docker CE 17.11 Edge and higher only) -- Zesty 17.04 - Xenial 16.04 (LTS) - Trusty 14.04 (LTS)