Skip to content

Commit

Permalink
fixup! OpenShift initial implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
sleshchenko committed Jul 18, 2017
1 parent 3ed5a8c commit f1dba42
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ ${CURL_INSTALLED} = false ] && [ ${WGET_INSTALLED} = false ]; then
CURL_INSTALLED=true
fi

test "$(id -u)" = 0 || test -f ${HOME}/is_arbitrary_user || SUDO="sudo -E"
test "$(id -u)" = 0 || SUDO="sudo -E"

CHE_DIR=$HOME/che
LOCAL_AGENT_BINARIES_URI='/mnt/che/terminal/websocket-terminal-${PREFIX}.tar.gz'
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/init/manifests/che.env
Original file line number Diff line number Diff line change
Expand Up @@ -458,4 +458,4 @@ CHE_SINGLE_PORT=false
#CHE_INFRA_OPENSHIFT_TRUST__CERTS=true

#CHE_INFRA_OPENSHIFT_CHE__SERVER__ENDPOINT=http://che-host:${SERVER_PORT}/wsmaster/api
#CHE_INFRA_OPENSHIFT_CHE__SERVER__WEBSOCKET__ENDPOINT_BASE=ws://che-host:${SERVER_PORT}/wsmaster
#CHE_INFRA_OPENSHIFT_CHE__SERVER__WEBSOCKET__ENDPOINT__BASE=ws://che-host:${SERVER_PORT}/wsmaster
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ ${CURL_INSTALLED} = false ] && [ ${WGET_INSTALLED} = false ]; then
CURL_INSTALLED=true
fi

test "$(id -u)" = 0 || test -f ${HOME}/is_arbitrary_user || SUDO="sudo -E"
test "$(id -u)" = 0 || SUDO="sudo -E"

LOCAL_AGENT_BINARIES_URI="/mnt/che/ws-agent.tar.gz"
DOWNLOAD_AGENT_BINARIES_URI='${WORKSPACE_MASTER_URI}/agent-binaries/ws-agent.tar.gz'
Expand All @@ -45,11 +45,9 @@ MACHINE_TYPE=$(uname -m)

mkdir -p ${CHE_DIR}

if [ ! -f ${HOME}/is_arbitrary_user ]; then
${SUDO} mkdir -p /projects
${SUDO} sh -c "chown -R $(id -u -n) /projects"
${SUDO} chmod 755 /projects
fi
${SUDO} mkdir -p /projects
${SUDO} sh -c "chown -R $(id -u -n) /projects"
${SUDO} chmod 755 /projects

INSTALL_JDK=false
command -v ${JAVA_HOME}/bin/java >/dev/null 2>&1 || {
Expand Down

0 comments on commit f1dba42

Please sign in to comment.