seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #3686 : Property around external docker has been changed in a refactoring but it has not been updated everywhere (#3753) 

Change-Id: I6da2c6f33cc063dda08b953eb2fab16abe4a0c86
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
6.19.x
Florent BENOIT 2017-01-17 02:49:46 -07:00 committed by GitHub
parent 66ef4f9322
commit dbdb0bc047
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dockerfiles/che/entrypoint.sh
View File

@ -264,12 +264,11 @@ init() {
sed -i "/che.workspace.terminal_linux_amd64=/c\che.workspace.terminal_linux_amd64=${CHE_DATA_HOST}/lib/linux_amd64/terminal" $CHE_LOCAL_CONF_DIR/che.properties
sed -i "/che.workspace.terminal_linux_arm7=/c\che.workspace.terminal_linux_arm7=${CHE_DATA_HOST}/lib/linux_arm7/terminal" $CHE_LOCAL_CONF_DIR/che.properties
# CHE_DOCKER_MACHINE_HOST_EXTERNAL must be set if you are in a VM.
HOSTNAME=${CHE_DOCKER_MACHINE_HOST_EXTERNAL:-$(get_docker_external_hostname)}
# CHE_DOCKER_IP_EXTERNAL must be set if you are in a VM.
HOSTNAME=${CHE_DOCKER_IP_EXTERNAL:-$(get_docker_external_hostname)}
if has_external_hostname; then
# Internal property used by Che to set hostname.
# See: LocalDockerInstanceRuntimeInfo.java#L9
export CHE_DOCKER_MACHINE_HOST_EXTERNAL=${HOSTNAME}
export CHE_DOCKER_IP_EXTERNAL=${HOSTNAME}
fi
### Necessary to allow the container to write projects to the folder
export CHE_WORKSPACE_STORAGE="${CHE_DATA_HOST}/workspaces"