diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md index 31fdff9944..1ba64e92dc 100644 --- a/_includes/docker_platform_matrix.md +++ b/_includes/docker_platform_matrix.md @@ -1,16 +1,16 @@ {% assign green-check = '{: style="height: 14px; margin: 0 auto"}' %} {% assign install-prefix = '/engine/installation/linux' %} -| Platform | Docker CE x86_64 | Docker CE ARM | Docker CE IBM Z (s390x) | Docker EE x86_64 | Docker EE IBM Z (s390x) | Docker EE IBM Power (ppc64le) | -|:---------------------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:---------------------------------------------------------------|:--------------------------------------------------------------|--------------------------------------------------------------| -| [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](/engine/installation/windows/docker-ee.md) | | | | [{{ green-check }}](/engine/installation/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-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 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](/engine/installation/windows/docker-ee.md) | | | | | [{{ green-check }}](/engine/installation/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)| > Limitations for Docker EE on IBM Power architecture > -> - Neither UCP managers nor workers are supported on IBM Power. \ No newline at end of file +> - Neither UCP managers nor workers are supported on IBM Power. diff --git a/engine/installation/linux/docker-ce/ubuntu.md b/engine/installation/linux/docker-ce/ubuntu.md index 1e19f2411e..2d64c8fbae 100644 --- a/engine/installation/linux/docker-ce/ubuntu.md +++ b/engine/installation/linux/docker-ce/ubuntu.md @@ -29,15 +29,14 @@ To learn more about Docker EE, see To install Docker CE, you need the 64-bit version of one of these Ubuntu versions: -- Artful 17.10 (Docker CE 17.11 Edge only) +- Artful 17.10 (Docker CE 17.11 Edge and higher only) - Zesty 17.04 - Xenial 16.04 (LTS) - Trusty 14.04 (LTS) -Docker CE is supported on Ubuntu on `x86_64`, `armhf`, and `s390x` (IBM z -Systems) architectures. +Docker CE is supported on Ubuntu on `x86_64`, `armhf`, `s390x` (IBM Z), and `ppc64le` (IBM Power) architectures. -> **`s390x` limitations**: System Z is only supported on Ubuntu Xenial and Zesty. +> **`ppc64le` and `s390x` limitations**: Packages for IBM Z and Power architectures are only available on Ubuntu Xenial and above. ### Uninstall old versions @@ -175,6 +174,7 @@ the repository.