From 2f38b1da6c54c34f9e61998f2c70e91bad3b0823 Mon Sep 17 00:00:00 2001
From: Oleksandr Andriienko <oandriie@redhat.com>
Date: Mon, 12 Aug 2019 11:53:06 +0300
Subject: [PATCH] Improve dev file (#42)

* Use newer go-lang language server. Make development container working on the minishift. Improve devfile tasks.

Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>

* Use stable editor for development. Improve some commands.

Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
---
 CONTRIBUTING.md            |  2 +-
 devfile.yaml               | 24 +++++++++++++-----------
 dockerfiles/dev/Dockerfile | 12 +++---------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc5f19cb4..cf489c0f1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -80,4 +80,4 @@ For communication with che-machine-exec use websocket protocol.
 
 #### Stop che-machine-exec server
 
-To stop che-machine-exec server you can use task with name `kill exec server`.
+To stop che-machine-exec server you can use task with name `stop exec server`.
diff --git a/devfile.yaml b/devfile.yaml
index 9b0434ae8..3fb2c2ec6 100644
--- a/devfile.yaml
+++ b/devfile.yaml
@@ -8,15 +8,12 @@ projects:
     type: git
     location: https://github.com/eclipse/che-machine-exec.git
 components:
-  - alias: theia-editor
-    type: cheEditor
-    id: eclipse/che-theia/next
   - alias: exec-plugin
     type: chePlugin
     id: eclipse/che-machine-exec-plugin/0.0.1
   - alias: ms-vscode.go
     type: chePlugin
-    id: ms-vscode/go/0.9.2
+    id: ms-vscode/go/0.11.0
   - alias: typescript-plugin
     type: chePlugin
     id: che-incubator/typescript/1.30.2
@@ -34,7 +31,7 @@ components:
     memoryLimit: 3Gi
   - alias: dev
     type: dockerimage
-    image: eclipse/che-machine-exec-dev
+    image: eclipse/che-machine-exec-dev:next
     mountSources: true
     endpoints:
       - name: exec-server
@@ -47,9 +44,11 @@ components:
     memoryLimit: 1024M
     env:
       - name: GOPATH
-        value: $(CHE_PROJECTS_ROOT)
+        value: /go:$(CHE_PROJECTS_ROOT)
       - name: GOCACHE
-        value: $(GOPATH)/.cache
+      # replicate the GOCACHE from the plugin, even though the cache is not shared
+      # between the two
+        value: /tmp/.cache
 commands:
   - name: compile
     actions:
@@ -67,13 +66,13 @@ commands:
     actions:
       - type: exec
         component: dev
-        command: go fmt ./...
+        command: go fmt ./... && printf "\033[32mDone.\033[0m"
         workdir: /projects/src/github.com/eclipse/che-machine-exec
   - name: update dependencies
     actions:
       - type: exec
         component: dev
-        command: dep ensure
+        command: dep ensure && printf "\033[32mDone.\033[0m"
         workdir: /projects/src/github.com/eclipse/che-machine-exec
   - name: start exec server
     actions:
@@ -81,8 +80,11 @@ commands:
         component: dev
         command: ./che-machine-exec --url 0.0.0.0:5555
         workdir: /projects/src/github.com/eclipse/che-machine-exec
-  - name: kill exec server
+  - name: stop exec server
     actions:
       - type: exec
         component: dev
-        command: ps aux | grep "[.]/che-machine-exec" | head -1 | cut -d " " -f 2 | xargs kill
+        command: >-
+          pid=$(pidof che-machine-exec) && kill ${pid} &&
+          printf "\033[32mDone.\033[0m" ||
+          printf "\033[32mNothing to stop... Done.\033[0m"
diff --git a/dockerfiles/dev/Dockerfile b/dockerfiles/dev/Dockerfile
index 2a6385354..358b92364 100644
--- a/dockerfiles/dev/Dockerfile
+++ b/dockerfiles/dev/Dockerfile
@@ -12,16 +12,10 @@
 # Dockerfile defines che-machine-exec development image eclipse/che-machine-exec-dev
 #
 
-FROM golang:1.10.3-alpine
+FROM quay.io/eclipse/che-golang-1.10:nightly
 
 ARG DEP_LOCATION=/go/bin/dep
 
-RUN apk add --update git bash wget less && \
-    wget https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-amd64 -O ${DEP_LOCATION} && \
-    chmod +x ${DEP_LOCATION} && \
-    apk del wget
+RUN wget https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-amd64 -O ${DEP_LOCATION} && \
+    chmod +x ${DEP_LOCATION}
 EXPOSE 5555 5555
-
-WORKDIR /projects
-
-CMD tail -f /dev/null