[debug] IDE

Author: iQQBot

components/ide/jetbrains/image/BUILD.yaml

@@ -13,10 +13,9 @@ packages:
     srcs:
       - "startup.sh"
       - "supervisor-ide-config_intellij.json"
-      - "status/go.mod"
-      - "status/main.go"
     deps:
       - components/ide/jetbrains/backend-plugin:plugin
+      - components/ide/jetbrains/image/status:app
     argdeps:
       - imageRepoBase
     config:
@@ -34,10 +33,9 @@ packages:
     srcs:
       - "startup.sh"
       - "supervisor-ide-config_goland.json"
-      - "status/go.mod"
-      - "status/main.go"
     deps:
       - components/ide/jetbrains/backend-plugin:plugin
+      - components/ide/jetbrains/image/status:app
     argdeps:
       - imageRepoBase
     config:
@@ -55,10 +53,9 @@ packages:
     srcs:
       - "startup.sh"
       - "supervisor-ide-config_pycharm.json"
-      - "status/go.mod"
-      - "status/main.go"
     deps:
       - components/ide/jetbrains/backend-plugin:plugin
+      - components/ide/jetbrains/image/status:app
     argdeps:
       - imageRepoBase
     config:
@@ -76,10 +73,9 @@ packages:
     srcs:
       - "startup.sh"
       - "supervisor-ide-config_phpstorm.json"
-      - "status/go.mod"
-      - "status/main.go"
     deps:
       - components/ide/jetbrains/backend-plugin:plugin
+      - components/ide/jetbrains/image/status:app
     argdeps:
       - imageRepoBase
     config:

components/ide/jetbrains/image/leeway.Dockerfile

@@ -2,11 +2,6 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM golang:1.17 AS build
-WORKDIR /app
-COPY status/* /app/
-RUN go build -o status
-
 FROM alpine:3.15 as download
 ARG JETBRAINS_BACKEND_URL
 WORKDIR /workdir
@@ -19,5 +14,5 @@ FROM scratch
 ARG SUPERVISOR_IDE_CONFIG
 COPY --chown=33333:33333 ${SUPERVISOR_IDE_CONFIG} /ide-desktop/supervisor-ide-config.json
 COPY --chown=33333:33333 startup.sh /ide-desktop/
-COPY --chown=33333:33333 --from=build /app/status /ide-desktop/
 COPY --chown=33333:33333 --from=download /workdir/ /ide-desktop/backend/
+COPY --chown=33333:33333 components-ide-jetbrains-image-status--app/status /ide-desktop/

components/ide/jetbrains/image/startup.sh

@@ -9,16 +9,7 @@ set -euo pipefail
 trap "jobs -p | xargs -r kill" SIGINT SIGTERM EXIT
 
 /ide-desktop/status "$1" "$2" &
-
-echo "Desktop IDE: Waiting for the content initializer ..."
-until curl -sS "$SUPERVISOR_ADDR"/_supervisor/v1/status/content/wait/true | grep '"available":true' > /dev/null; do
-    sleep 1
-done
-echo "Desktop IDE: Content available."
-
-export CWM_NON_INTERACTIVE=1
-export CWM_HOST_PASSWORD=gitpod
 export CWM_HOST_STATUS_OVER_HTTP_TOKEN=gitpod
-/ide-desktop/backend/bin/remote-dev-server.sh cwmHost "$GITPOD_REPO_ROOT" > >(sed 's/^/JetBrains remote-dev-server.sh (out): /') 2> >(sed 's/^/JetBrains remote-dev-server.sh (err): /' >&2)
+/ide-desktop/backend/bin/remote-dev-server.sh run "$GITPOD_REPO_ROOT" > >(sed 's/^/JetBrains remote-dev-server.sh (out): /') 2> >(sed 's/^/JetBrains remote-dev-server.sh (err): /' >&2)
 
-echo "Desktop IDE startup script exited"
+echo "Desktop IDE startup script exited"

components/ide/jetbrains/image/status/BUILD.yaml

@@ -0,0 +1,14 @@
+packages:
+  - name: app
+    type: go
+    srcs:
+      - "**/*.go"
+      - "go.mod"
+      - "go.sum"
+    env:
+      - CGO_ENABLED=0
+      - GOOS=linux
+    deps:
+      - components/supervisor-api/go:lib
+    config:
+      packaging: app

components/ide/jetbrains/image/status/go.mod

@@ -1,3 +1,21 @@
 module github.com/gitpod-io/gitpod/jetbrains/status
 
 go 1.17
+
+
+require google.golang.org/grpc v1.42.0
+
+require github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0 // indirect
+
+require (
+	github.com/gitpod-io/gitpod/supervisor/api v0.0.0-00010101000000-000000000000
+	github.com/golang/protobuf v1.5.2 // indirect
+	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
+	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
+	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
+	google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+)
+
+replace github.com/gitpod-io/gitpod/supervisor/api => ../../../../supervisor-api/go // leeway