CLI: Use new che-mount & adds mechanism for CLI to update itself to new versions #2535

TylerJewell · 2016-09-21T23:47:35Z

What does this PR do?

1: Alters the syntax so that volume mounts can have windows paths with spaces and dots.
2: Changes the syntax so that always $PWD will be selected as the local mount point.
3: Adds in discovery - if there is only a single ws running, will find the SSH port and use that.
4: If there are multiple workspaces with valid SSH ports, lists all of them and their ports.
5: Adds in new capability that allows users to download specific version of CLI and run it.
6: Uses curl to download initial CLI if it is not already there.

This new logic assumes that SSH:
1: Is running on port 22/tcp within the container, and:
2: Is accessible by the user named 'user'.

It will be better in the future, if we only exchange keys and automate this. Will wait for Florent's improvements here.

TylerJewell · 2016-09-21T23:47:46Z

@benoitf @l0rd

codenvy-ci · 2016-09-22T00:30:16Z

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/463/

l0rd · 2016-09-22T07:47:36Z

che.sh

+
+    if [ $CURRENT_WS_COUNT -eq 0 ]; then
+      error "${CHE_MINI_PRODUCT_NAME} mount: We could not find any running workspaces"
+


You should return after printing the error message

l0rd · 2016-09-22T07:51:56Z

che.sh

+                                   -v ${HOME}/.unison:${HOME}/.unison \
+                                   -v /etc/group:/etc/group:ro \
+                                   -v /etc/passwd:/etc/passwd:ro \
+                                   -u $(id -u ${USER})


The backslash at the end of the line is missing

yes, another good catch.

l0rd

I've tested on OSX and Linux. There are couple of things to fixes. Besides that LGTM

benoitf · 2016-09-22T09:01:11Z

che.sh

+                                   -u $(id -u ${USER})
+                                   -v "${MOUNT_PATH}":/mnthost \
+                                   "${CHE_MOUNT_IMAGE_NAME}":"${CHE_UTILITY_VERSION}" \
+                                        "${GLOBAL_GET_DOCKER_HOST_IP}" $WS_PORT


indent is wrong

The indent was intended that way for readability - because it's the post container params.

benoitf · 2016-09-22T09:01:25Z

che.sh

+                                   -v "${HOME_PATH}"/.ssh:/root/.ssh \
+                                   -v "${MOUNT_PATH}":/mnthost \
+                                   "${CHE_MOUNT_IMAGE_NAME}":"${CHE_UTILITY_VERSION}" \
+                                        "${GLOBAL_GET_DOCKER_HOST_IP}" $WS_PORT


The indent was intended that way for readability - because it's the post container params.

benoitf · 2016-09-22T09:02:55Z

che.sh

+
+    elif [ $CURRENT_WS_COUNT -eq 1 ]; then
+      RUNNING_WS_PORT=$(docker inspect --format='{{ (index (index .NetworkSettings.Ports "22/tcp") 0).HostPort }}' ${CURRENT_WS_INSTANCES})
+      info "${CHE_MINI_PRODUCT_NAME} mount: Connecting to remote workspace on port $RUNNING_WS_PORT"


side note
if we're always using info "${CHE_MINI_PRODUCT_NAME}
"${CHE_MINI_PRODUCT_NAME} " should be inside info function

or we need to add another info commands to avoid to write ${CHE_MINI_PRODUCT_NAME} in all cals

Yes, i agree - will address in another improvement.

benoitf · 2016-09-22T09:03:44Z

che.sh

+      error "${CHE_MINI_PRODUCT_NAME} mount: We could not find any running workspaces"
+
+    elif [ $CURRENT_WS_COUNT -eq 1 ]; then
+      RUNNING_WS_PORT=$(docker inspect --format='{{ (index (index .NetworkSettings.Ports "22/tcp") 0).HostPort }}' ${CURRENT_WS_INSTANCES})


what if there is no ssh running ?

I made a number of improvements to handle this:

I now get a list of all ws containers.

I added in a check to see if they have ssh or not.

I then print out a list of all the containers their SSH port & whether they have SSH.

INFO: che mount: Setting local mount path to /c/codenvy/tmp/dir 4 INFO: che mount: Searching for running workspaces with open SSH port... INFO: che mount: Re-run with 'che mount <ssh-port>' WS CONTAINER ID HAS SSH? SSH PORT 3ca5f2d5c302 y 32797 33c0ce87fabf n 679494b6cae7 y 32788

codenvy-ci · 2016-09-22T21:38:57Z

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/486/

codenvy-ci · 2016-09-23T01:41:25Z

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/488/

benoitf · 2016-09-23T10:15:40Z

cli.sh is being part of this pull request but it seems cli.sh is already in che repository which look strange ? as this PR seems to want to split it in two parts

benoitf · 2016-09-23T10:18:02Z

cli.sh

@@ -0,0 +1,956 @@
+init_global_variables() {


Requires copyright headers + shebang

benoitf · 2016-09-23T10:18:47Z

cli.sh

+  if is_boot2docker && has_docker_for_windows_client; then
+  	if [[ "${CHE_DATA_FOLDER,,}" != *"${USERPROFILE,,}"* ]]; then
+  	  CHE_DATA_FOLDER=$(get_mount_path "${USERPROFILE}/.${CHE_MINI_PRODUCT_NAME}/")
+      warning "Boot2docker for Windows - CHE_DATA_FOLDER set to $CHE_DATA_FOLDER"   


indent look odd to me

benoitf · 2016-09-23T10:19:23Z

che.sh

-    usage
-  ;;
-esac
+execute_cli "$@"


missing end of line

benoitf · 2016-09-23T13:37:24Z

$ ./che.sh start
INFO: Pulling image curl:latest
INFO: Downloading cli-latest
INFO: ECLIPSE CHE: Already have image codenvy/che-server:latest
INFO: ECLIPSE CHE: Starting container...
INFO: ECLIPSE CHE: Server logs at "docker logs -f che-server"
INFO: ECLIPSE CHE: Server booting...
INFO: ECLIPSE CHE: Booted and reachable
INFO: ECLIPSE CHE: http://localhost:8080


$ export CHE_VERSION=nightly
benoitf@MacBookFlorent:che (che-mount-cli=)$ ./che.sh start
INFO: ECLIPSE CHE: Already have image codenvy/che-server:nightly
INFO: ECLIPSE CHE: Starting container...
INFO: ECLIPSE CHE: Server logs at "docker logs -f che-server"
INFO: ECLIPSE CHE: Server booting...
INFO: ECLIPSE CHE: Booted and reachable
INFO: ECLIPSE CHE: http://localhost:8080

…e-mount-cli

codenvy-ci · 2016-09-23T15:56:32Z

Build # 502 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/502/ to view the results.

…ew versions (eclipse-che#2535) * initial * update usage

Tyler Jewell added 2 commits September 21, 2016 16:40

initial

5caf419

update usage

86f57b9

TylerJewell added kind/enhancement A feature request - must adhere to the feature request template. team/pm labels Sep 21, 2016

TylerJewell added this to the 5.0.0-M3 milestone Sep 21, 2016

TylerJewell self-assigned this Sep 21, 2016

TylerJewell mentioned this pull request Sep 22, 2016

CLI - che mount Fails #2442

Closed

l0rd reviewed Sep 22, 2016

View reviewed changes

l0rd requested changes Sep 22, 2016

View reviewed changes

benoitf reviewed Sep 22, 2016

View reviewed changes

updates

28f715e

Tyler Jewell added 3 commits September 22, 2016 17:43

update

d25428b

update

4a7d911

update

53dc16f

TylerJewell changed the title ~~CLI: Use new che-mount & discover ws~~ CLI: Use new che-mount & adds mechanism for CLI to update itself to new versions Sep 23, 2016

benoitf reviewed Sep 23, 2016

View reviewed changes

Tyler Jewell added 7 commits September 23, 2016 06:42

fixup

f75d165

initial

f2d5bd4

update usage

e8c4104

updates

ff0b2ae

update

9e313e7

update

8c1903c

update

10e4432

Merge branch 'che-mount-cli' of http://github.com/eclipse/che into ch…

653cda9

…e-mount-cli

benoitf force-pushed the che-mount-cli branch from 653cda9 to 0b68664 Compare September 23, 2016 13:56

TylerJewell force-pushed the che-mount-cli branch from 0b68664 to 653cda9 Compare September 23, 2016 13:58

newline

b2dad45

benoitf approved these changes Sep 23, 2016

View reviewed changes

TylerJewell merged commit c77e542 into master Sep 23, 2016

TylerJewell deleted the che-mount-cli branch September 23, 2016 14:01

bmicklea mentioned this pull request Sep 28, 2016

5.0.0-M3 Milestone Overview #2641

Closed

63 tasks

JPinkney pushed a commit to JPinkney/che that referenced this pull request Aug 17, 2017

CLI: Use new che-mount & adds mechanism for CLI to update itself to n…

8a8e7cc

…ew versions (eclipse-che#2535) * initial * update usage

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CLI: Use new che-mount & adds mechanism for CLI to update itself to new versions #2535

CLI: Use new che-mount & adds mechanism for CLI to update itself to new versions #2535

TylerJewell commented Sep 21, 2016 •

edited

Loading

TylerJewell commented Sep 21, 2016

codenvy-ci commented Sep 22, 2016

l0rd Sep 22, 2016

TylerJewell Sep 22, 2016

l0rd Sep 22, 2016

TylerJewell Sep 22, 2016

l0rd left a comment

benoitf Sep 22, 2016

TylerJewell Sep 22, 2016

benoitf Sep 22, 2016

TylerJewell Sep 22, 2016

benoitf Sep 22, 2016

TylerJewell Sep 22, 2016

benoitf Sep 22, 2016 •

edited

Loading

TylerJewell Sep 22, 2016

codenvy-ci commented Sep 22, 2016

codenvy-ci commented Sep 23, 2016

benoitf commented Sep 23, 2016 •

edited

Loading

benoitf Sep 23, 2016

TylerJewell Sep 23, 2016

benoitf Sep 23, 2016

TylerJewell Sep 23, 2016

benoitf Sep 23, 2016

TylerJewell Sep 23, 2016

benoitf commented Sep 23, 2016

codenvy-ci commented Sep 23, 2016


		if [ $CURRENT_WS_COUNT -eq 0 ]; then
		error "${CHE_MINI_PRODUCT_NAME} mount: We could not find any running workspaces"

CLI: Use new che-mount & adds mechanism for CLI to update itself to new versions #2535

CLI: Use new che-mount & adds mechanism for CLI to update itself to new versions #2535

Conversation

TylerJewell commented Sep 21, 2016 • edited Loading

What does this PR do?

TylerJewell commented Sep 21, 2016

codenvy-ci commented Sep 22, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

l0rd left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

benoitf Sep 22, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codenvy-ci commented Sep 22, 2016

codenvy-ci commented Sep 23, 2016

benoitf commented Sep 23, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

benoitf commented Sep 23, 2016

codenvy-ci commented Sep 23, 2016

TylerJewell commented Sep 21, 2016 •

edited

Loading

benoitf Sep 22, 2016 •

edited

Loading

benoitf commented Sep 23, 2016 •

edited

Loading