using supervisor pass IDE port to desktop IDE

Author: iQQBot

components/ide/code-desktop/startup.sh

@@ -8,6 +8,6 @@ set -euo pipefail
 # kill background jobs when the script exits
 trap "jobs -p | xargs -r kill" SIGINT SIGTERM EXIT
 
-/ide-desktop/status 24000 "$1" "$2"
+/ide-desktop/status "$1" "$2" "$3"
 
 echo "Desktop IDE startup script exited"

components/ide/code-desktop/supervisor-ide-config_insiders.json

@@ -1,10 +1,9 @@
 {
     "entrypoint": "/ide-desktop/startup.sh",
-    "entrypointArgs": [ "Open in VS Code Insiders on Desktop", "vscode-insiders" ],
+    "entrypointArgs": [ "{DESKTOPIDEPORT}", "Open in VS Code Insiders on Desktop", "vscode-insiders" ],
     "readinessProbe": {
         "type": "http",
         "http": {
-            "port": 24000,
             "path": "/status"
         }
       }

components/ide/code-desktop/supervisor-ide-config_stable.json

@@ -1,10 +1,9 @@
 {
     "entrypoint": "/ide-desktop/startup.sh",
-    "entrypointArgs": [ "Open in VS Code on Desktop", "vscode" ],
+    "entrypointArgs": [ "{DESKTOPIDEPORT}", "Open in VS Code on Desktop", "vscode" ],
     "readinessProbe": {
         "type": "http",
         "http": {
-            "port": 24000,
             "path": "/status"
         }
       }

components/ide/jetbrains/image/startup.sh

@@ -8,7 +8,7 @@ set -euo pipefail
 # kill background jobs when the script exits
 trap "jobs -p | xargs -r kill" SIGINT SIGTERM EXIT
 
-/ide-desktop/status 24000 "$1" &
+/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

components/ide/jetbrains/image/supervisor-ide-config_goland.json

@@ -1,10 +1,9 @@
 {
     "entrypoint": "/ide-desktop/startup.sh",
-    "entrypointArgs": [ "Open in GoLand" ],
+    "entrypointArgs": [ "{DESKTOPIDEPORT}", "Open in GoLand" ],
     "readinessProbe": {
         "type": "http",
         "http": {
-            "port": 24000,
             "path": "/status"
         }
       }

components/ide/jetbrains/image/supervisor-ide-config_intellij.json

@@ -1,10 +1,9 @@
 {
     "entrypoint": "/ide-desktop/startup.sh",
-    "entrypointArgs": [ "Open in IntelliJ IDEA" ],
+    "entrypointArgs": [ "{DESKTOPIDEPORT}", "Open in IntelliJ IDEA" ],
     "readinessProbe": {
         "type": "http",
         "http": {
-            "port": 24000,
             "path": "/status"
         }
       }

components/ide/jetbrains/image/supervisor-ide-config_phpstorm.json

@@ -1,10 +1,9 @@
 {
     "entrypoint": "/ide-desktop/startup.sh",
-    "entrypointArgs": [ "Open in PhpStorm" ],
+    "entrypointArgs": [ "{DESKTOPIDEPORT}", "Open in PhpStorm" ],
     "readinessProbe": {
         "type": "http",
         "http": {
-            "port": 24000,
             "path": "/status"
         }
       }

components/ide/jetbrains/image/supervisor-ide-config_pycharm.json

@@ -1,10 +1,9 @@
 {
     "entrypoint": "/ide-desktop/startup.sh",
-    "entrypointArgs": [ "Open in PyCharm" ],
+    "entrypointArgs": [ "{DESKTOPIDEPORT}", "Open in PyCharm" ],
     "readinessProbe": {
         "type": "http",
         "http": {
-            "port": 24000,
             "path": "/status"
         }
       }

components/supervisor/pkg/supervisor/supervisor.go

@@ -59,6 +59,7 @@ const (
 	gitpodUserName  = "gitpod"
 	gitpodGID       = 33333
 	gitpodGroupName = "gitpod"
+	desktopIDEPort  = 24000
 )
 
 var (
@@ -192,7 +193,6 @@ func Run(options ...RunOption) {
 	ctx, cancel := context.WithCancel(context.Background())
 
 	internalPorts := []uint32{uint32(cfg.IDEPort), uint32(cfg.APIEndpointPort), uint32(cfg.SSHPort)}
-	desktopIDEPort := uint32(24000)
 	if cfg.DesktopIDE != nil {
 		internalPorts = append(internalPorts, desktopIDEPort)
 	}
@@ -632,8 +632,8 @@ func launchIDE(cfg *Config, ideConfig *IDEConfig, cmd *exec.Cmd, ideStopped chan
 		s = func() *ideStatus { i := statusShouldRun; return &i }()
 
 		go func() {
-			desktopIDEStatus := runIDEReadinessProbe(cfg, ideConfig, ide)
-			ideReady.Set(true, desktopIDEStatus)
+			IDEStatus := runIDEReadinessProbe(cfg, ideConfig, ide)
+			ideReady.Set(true, IDEStatus)
 		}()
 
 		err = cmd.Wait()
@@ -666,6 +666,7 @@ func prepareIDELaunch(cfg *Config, ideConfig *IDEConfig) *exec.Cmd {
 		args[i] = strings.ReplaceAll(args[i], "{WORKSPACEROOT}", cfg.WorkspaceRoot)
 		args[i] = strings.ReplaceAll(args[i], "{IDEPORT}", strconv.Itoa(cfg.IDEPort))
 		args[i] = strings.ReplaceAll(args[i], "{IDEHOSTNAME}", "0.0.0.0")
+		args[i] = strings.ReplaceAll(args[i], "{DESKTOPIDEPORT}", strconv.Itoa(desktopIDEPort))
 	}
 	log.WithField("args", args).WithField("entrypoint", ideConfig.Entrypoint).Info("preparing IDE launch")
 
@@ -775,6 +776,10 @@ func runIDEReadinessProbe(cfg *Config, ideConfig *IDEConfig, ide IDEKind) (deskt
 		return value
 	}
 
+	defaultProbePort := cfg.IDEPort
+	if ide == DesktopIDE {
+		defaultProbePort = desktopIDEPort
+	}
 	switch ideConfig.ReadinessProbe.Type {
 	case ReadinessProcessProbe:
 		return
@@ -783,7 +788,7 @@ func runIDEReadinessProbe(cfg *Config, ideConfig *IDEConfig, ide IDEKind) (deskt
 		var (
 			schema = defaultIfEmpty(ideConfig.ReadinessProbe.HTTPProbe.Schema, "http")
 			host   = defaultIfEmpty(ideConfig.ReadinessProbe.HTTPProbe.Host, "localhost")
-			port   = defaultIfZero(ideConfig.ReadinessProbe.HTTPProbe.Port, cfg.IDEPort)
+			port   = defaultIfZero(ideConfig.ReadinessProbe.HTTPProbe.Port, defaultProbePort)
 			url    = fmt.Sprintf("%s://%s:%d/%s", schema, host, port, strings.TrimPrefix(ideConfig.ReadinessProbe.HTTPProbe.Path, "/"))
 			client = http.Client{Timeout: 1 * time.Second}
 			tick   = time.NewTicker(500 * time.Millisecond)