From 85db825583600a6f21b74e60d54a98b9aef53b3d Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Mon, 6 Nov 2017 09:39:03 -0800 Subject: [PATCH 1/2] Add info about selinux limitations for IBM Z --- engine/installation/linux/docker-ee/rhel.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/engine/installation/linux/docker-ee/rhel.md b/engine/installation/linux/docker-ee/rhel.md index 79429c1d3ec..143dc389de7 100644 --- a/engine/installation/linux/docker-ee/rhel.md +++ b/engine/installation/linux/docker-ee/rhel.md @@ -34,6 +34,16 @@ In addition, you must use the `devicemapper` storage driver. On production systems, you must use `direct-lvm` mode, which requires one or more dedicated block devices. Fast storage such as solid-state media (SSD) is recommended. +{% capture selinux-warning % +> **Warning**: There is currently no support for `selinux` on IBM Z systems. If +> you try to install Docker EE on an IBM Z system with `selinux` enabled, you get +> an error about the `container-selinux` package, which is missing from Red Hat's +> repository for IBM Z. The only current workaround is to disable `selinux` +> before installing or upgrading Docker on IBM Z. +{:.warning} +{% endcapture %} +{{ selinux-warning }} + ### Uninstall old versions Older versions of Docker were called `docker` or `docker-engine`. If these are @@ -68,6 +78,8 @@ from the repository. #### Install Docker EE +{{ selinux-warning }} + {% include ee-linux-install-reuse.md section="install-using-yum-repo" %} #### Upgrade Docker EE @@ -76,6 +88,8 @@ from the repository. ### Install from a package +{{ selinux-warning }} + {% include ee-linux-install-reuse.md section="install-using-yum-package" %} #### Upgrade Docker EE From a6487ef29b726510a5837c045ee06fe127a050bc Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Mon, 6 Nov 2017 10:07:01 -0800 Subject: [PATCH 2/2] Fix liquid error --- engine/installation/linux/docker-ee/rhel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/installation/linux/docker-ee/rhel.md b/engine/installation/linux/docker-ee/rhel.md index 143dc389de7..698eea1007b 100644 --- a/engine/installation/linux/docker-ee/rhel.md +++ b/engine/installation/linux/docker-ee/rhel.md @@ -34,7 +34,7 @@ In addition, you must use the `devicemapper` storage driver. On production systems, you must use `direct-lvm` mode, which requires one or more dedicated block devices. Fast storage such as solid-state media (SSD) is recommended. -{% capture selinux-warning % +{% capture selinux-warning %} > **Warning**: There is currently no support for `selinux` on IBM Z systems. If > you try to install Docker EE on an IBM Z system with `selinux` enabled, you get > an error about the `container-selinux` package, which is missing from Red Hat's