From dbdb0bc04783e2e7cbf94c665752b4ddfe99e08d Mon Sep 17 00:00:00 2001 From: Florent BENOIT Date: Tue, 17 Jan 2017 02:49:46 -0700 Subject: [PATCH] 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 --- dockerfiles/che/entrypoint.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dockerfiles/che/entrypoint.sh b/dockerfiles/che/entrypoint.sh index 4593b04ab1..d4b1f65fcf 100755 --- a/dockerfiles/che/entrypoint.sh +++ b/dockerfiles/che/entrypoint.sh @@ -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"