From 432e4e13655d52dda7a509fb314c72a138cd8273 Mon Sep 17 00:00:00 2001
From: Oleksandr Garagatyi <ogaragat@redhat.com>
Date: Thu, 11 Jan 2018 12:31:25 +0200
Subject: [PATCH] CHE-7532: update networking comments in che.env

Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
---
 dockerfiles/init/manifests/che.env | 31 ++++++++----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/dockerfiles/init/manifests/che.env b/dockerfiles/init/manifests/che.env
index 10f6e0577d..19ec1a91e7 100644
--- a/dockerfiles/init/manifests/che.env
+++ b/dockerfiles/init/manifests/che.env
@@ -150,7 +150,7 @@
 
 ########################################################################################
 #####                                                                              #####
-#####                                 NETWORKING                                   #####
+#####                    NETWORKING FOR CHE ON DOCKER                              #####
 #####                                                                              #####
 #
 # Affects how the Che server connects to the Docker Daemon, how the Che server and
@@ -170,30 +170,15 @@
 #    3. Else, use Unix socket over unix:///var/run/docker.sock
 #
 # Che Server --> Workspace Connection:
-#    - If CHE_DOCKER_SERVER__EVALUATION__STRATEGY is 'default':
-#        1. Use the value of CHE_DOCKER_IP
-#        2. Else, if server connects over Unix socket, then use localhost
-#        3. Else, use DOCKER_HOST
-#    - If CHE_DOCKER_SERVER__EVALUATION__STRATEGY is 'docker-local':
-#        1. Use the address of the workspace container within the docker network 
-#           and exposed ports
-#        2. If address is missing, if server connects over Unix socket, then use 
-#           localhost and exposed ports
-#        3. Else, use DOCKER_HOST and published ports
+
+#    - If CHE_DOCKER_IP is set use its value
+#    - Else use the address of the workspace container within the docker network and exposed ports
 #
 # Browser --> Workspace Connection:
-#    - If CHE_DOCKER_SERVER__EVALUATION__STRATEGY is 'default':
-#        1. If set use the value of CHE_DOCKER_IP_EXTERNAL
-#        2. Else if set use the value of CHE_DOCKER_IP
-#        3. Else, if server connects over Unix socket, then use localhost
-#        4. Else, use DOCKER_HOST
-#    - If CHE_DOCKER_SERVER__EVALUATION__STRATEGY is 'docker-local':
-#        1. If set use the value of CHE_DOCKER_IP_EXTERNAL
-#        2. Else use the address of the workspace container within the docker network, 
-#           if it is set
-#        3. If address is missing, if server connects over Unix socket, then use 
-#           localhost
-#        4. Else, use DOCKER_HOST
+#    - If set use the value of CHE_DOCKER_IP_EXTERNAL
+#    - Else, if Docker for Mac or Windows use localhost
+#    - Else, if set use the value of CHE_DOCKER_IP
+#    - Else use the address of the workspace container within the docker network and exposed ports
 #
 # Workspace Agent --> Che Server
 #    1. Default is 'http://che-host:${SERVER_PORT}/api', where 'che-host'