From 362bba9a4715a0e0e9a13149f7e55950005a8912 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Steenis <mail@superseb.nl>
Date: Tue, 10 Jul 2018 23:29:30 +0200
Subject: [PATCH] Add RHEL/CentOS upstream/native differentiation

---
 .../rke/v0.1.x/en/installation/os/_index.md   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/content/rke/v0.1.x/en/installation/os/_index.md b/content/rke/v0.1.x/en/installation/os/_index.md
index 30f7f5c1b4d..1246195ae07 100644
--- a/content/rke/v0.1.x/en/installation/os/_index.md
+++ b/content/rke/v0.1.x/en/installation/os/_index.md
@@ -12,11 +12,30 @@ RKE runs on almost any Linux OS with Docker installed. Most of the development a
    ```
 
    See [Manage Docker as a non-root user](https://docs.docker.com/install/linux/linux-postinstall/#manage-docker-as-a-non-root-user) to see how you can configure access to Docker without using the `root` user.
+
 - Swap should be disabled on any worker nodes
 
 ### RedHat Enterprise Linux (RHEL) / CentOS
 
-If using RedHat Enterprise Linux or CentOS, you cannot use the `root` user as [SSH user]({{< baseurl >}}/rke/v0.1.x/en/config-options/nodes/#ssh-user) due to [Bugzilla 1527565](https://bugzilla.redhat.com/show_bug.cgi?id=1527565). If you are using the Docker package supplied by RedHat / CentOS, the `dockerroot` group is automatically added to the system. You will need to edit (or create) `/etc/docker/daemon.json` to include the following:
+If using RedHat Enterprise Linux or CentOS, you cannot use the `root` user as [SSH user]({{< baseurl >}}/rke/v0.1.x/en/config-options/nodes/#ssh-user) due to [Bugzilla 1527565](https://bugzilla.redhat.com/show_bug.cgi?id=1527565). Please follow the instructions below how to setup Docker correctly, based on the way you installed Docker on the node.
+
+#### Using upstream Docker
+If you are using upstream Docker, the package name is `docker-ce` or `docker-ee`. You can check the installed package by executing:
+
+```
+rpm -q docker-ce
+```
+
+When using the upstream Docker packages, please follow [Manage Docker as a non-root user](https://docs.docker.com/install/linux/linux-postinstall/#manage-docker-as-a-non-root-user).
+
+#### Using RHEL/CentOS packaged Docker
+If you are using the Docker Docker package supplied by RedHat / CentOS, the package name is `docker`. You can check the installed package by executing:
+
+```
+rpm -q docker
+```
+
+If you are using the Docker package supplied by RedHat / CentOS, the `dockerroot` group is automatically added to the system. You will need to edit (or create) `/etc/docker/daemon.json` to include the following:
 
 ```
 {