Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cli] Simpler networking config explanation & command line overrides #4114

Merged
merged 13 commits into from
Feb 14, 2017
Merged

[cli] Simpler networking config explanation & command line overrides #4114

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bfd7d68
Update docs
Feb 11, 2017
b53d88d
better variables
Feb 11, 2017
988a45c
fixup
Feb 11, 2017
dd437f2
apply overrides
Feb 11, 2017
f254ef1
fixup
Feb 11, 2017
9b30044
fixup
Feb 11, 2017
2db9dda
fixup
Feb 11, 2017
7c34eff
CLI overrides
Feb 11, 2017
66b7dbb
fixup
Feb 11, 2017
33a30ab
fixup
Feb 11, 2017
26bdde2
fixup
Feb 11, 2017
e13e71f
use /dev/./urandom to speed up che start up on nodes with low entropy
Feb 14, 2017
a5cbc26
Merge branch 'master' into clean-networking
Feb 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions dockerfiles/init/manifests/che.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,44 +117,48 @@
#
# Browser --> Che Server
# 1. Default is 'http://localhost:${SERVER_PORT}/wsmaster/api'.
# 2. Else use the value of che.api
# 2. Else use the value of CHE_API
#
# Che Server --> Docker Daemon Progression:
# 1. Use the value of che.docker.daemon_url
# 1. Use the value of CHE_DOCKER_DAEMON__URL
# 2. Else, use the value of DOCKER_HOST system variable
# 3. Else, use Unix socket over unix:///var/run/docker.sock
#
# Che Server --> Workspace Connection (see Workspace Address Resolution Strategy, below):
# Che Server --> Workspace Connection:
# - If CHE_DOCKER_SERVER__EVALUATION__STRATEGY is 'default':
# 1. Use the value of che.docker.ip
# 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 published ports
# 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 published ports
# 3. Else, use DOCKER_HOST and published ports
#
# Browser --> Workspace Connection (see Workspace Address Resolution Strategy, below):
# 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
# 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
# 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
#
# Workspace Agent --> Che Server
# 1. Default is http://che-host:${SERVER_PORT}/wsmaster/api, where che-host is IP of server.
# 2. Else, use value of che.workspace.che_server_endpoint
# 3. Else, if 'docker0' interface is unreachable, then che-host replaced with
# 1. Default is 'http://che-host:${SERVER_PORT}/wsmaster/api', where 'che-host'
# is IP of server.
# 2. Else, use value of CHE_WORKSPACE_CHE__SERVER__ENDPOINT
# 3. Else, if 'docker0' interface is unreachable, then 'che-host' replaced with
# 172.17.42.1 or 192.168.99.1
# 4. Else, print connection exception



########################################################################################
##### #####
##### DOCKER #####
Expand Down