[jetbrains] Add PyCharm IDE

gitpod-io · Dec 2, 2021 · 64539bf · 64539bf
1 parent 6f0f32e
commit 64539bf
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 0 deletions.
diff --git a/chart/templates/server-ide-configmap.yaml b/chart/templates/server-ide-configmap.yaml
@@ -98,6 +98,13 @@ options:
     label: "EAP"
     notes: ["While in beta, when you open a workspace with GoLand you will need to use the password “gitpod”."]
     image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.goland)) }}
+  pycharm:
+    orderKey: "06"
+    title: "PyCharm"
+    type: "desktop"
+    logo: "https://upload.wikimedia.org/wikipedia/commons/1/1d/PyCharm_Icon.svg"
+    notes: ["While in beta, when you open a workspace with PyCharm you will need to use the password “gitpod”."]
+    image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.pycharm)) }}
 
 defaultIde: "code"
 defaultDesktopIde: "code-desktop"

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -410,6 +410,8 @@ components:
         imageName: "ide/intellij"
       goland:
         imageName: "ide/goland"
+      pycharm:
+        imageName: "ide/pycharm"
     supervisor:
       imageName: "supervisor"
     dockerUp:

diff --git a/components/BUILD.yaml b/components/BUILD.yaml
@@ -44,6 +44,7 @@ packages:
       - components/ide/code-desktop:docker-insiders
       - components/ide/jetbrains/image:intellij
       - components/ide/jetbrains/image:goland
+      - components/ide/jetbrains/image:pycharm
       - components/ide/theia:docker
       - components/image-builder:docker
       - components/image-builder-mk3:docker

diff --git a/components/ide/jetbrains/image/BUILD.yaml b/components/ide/jetbrains/image/BUILD.yaml
@@ -6,6 +6,7 @@ packages:
     deps:
       - :intellij
       - :goland
+      - :pycharm
   - name: intellij
     type: docker
     srcs:
@@ -48,3 +49,24 @@ packages:
       image:
         - ${imageRepoBase}/ide/goland:${version}
         - ${imageRepoBase}/ide/goland:commit-${__git_commit}
+  - name: pycharm
+    type: docker
+    srcs:
+      - "startup.sh"
+      - "supervisor-ide-config_pycharm.json"
+      - "status/go.mod"
+      - "status/main.go"
+    deps:
+      - components/ide/jetbrains/backend-plugin:plugin
+    argdeps:
+      - imageRepoBase
+    config:
+      dockerfile: leeway.Dockerfile
+      metadata:
+        helm-component: workspace.desktopIdeImages.pycharm
+      buildArgs:
+        JETBRAINS_BACKEND_URL: "https://download.jetbrains.com/python/pycharm-professional-2021.3.tar.gz"
+        SUPERVISOR_IDE_CONFIG: supervisor-ide-config_pycharm.json
+      image:
+        - ${imageRepoBase}/ide/pycharm:${version}
+        - ${imageRepoBase}/ide/pycharm:commit-${__git_commit}
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_pycharm.json b/components/ide/jetbrains/image/supervisor-ide-config_pycharm.json
@@ -0,0 +1,11 @@
+{
+    "entrypoint": "/ide-desktop/startup.sh",
+    "entrypointArgs": [ "Open in PyCharm" ],
+    "readinessProbe": {
+        "type": "http",
+        "http": {
+            "port": 24000,
+            "path": "/status"
+        }
+      }
+}
diff --git a/installer/pkg/components/server/ide-configmap.go b/installer/pkg/components/server/ide-configmap.go
@@ -97,6 +97,14 @@ func ideconfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 					Notes:    []string{"While in beta, when you open a workspace with GoLand you will need to use the password “gitpod”."},
 					Image:    common.ImageName(ctx.Config.Repository, workspace.GoLandDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandImage.Version),
 				},
+				"pycharm": {
+					OrderKey: pointer.String("06"),
+					Title:    "PyCharm",
+					Type:     typeDesktop,
+					Logo:     "https://upload.wikimedia.org/wikipedia/commons/1/1d/PyCharm_Icon.svg", // TODO(clu): Serve logo from our own components instead of using this wikimedia URL.
+					Notes:    []string{"While in beta, when you open a workspace with PyCharm you will need to use the password “gitpod”."},
+					Image:    common.ImageName(ctx.Config.Repository, workspace.PyCharmDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandImage.Version),
+				},
 			},
 			DefaultIDE:        "code",
 			DefaultDesktopIDE: "code-desktop",

diff --git a/installer/pkg/components/workspace/constants.go b/installer/pkg/components/workspace/constants.go
@@ -15,6 +15,7 @@ const (
 	CodeDesktopInsidersIDEImage  = "ide/code-desktop-insiders"
 	IntelliJDesktopIDEImage      = "ide/intellij"
 	GoLandDesktopIdeImage        = "ide/goland"
+	PyCharmDesktopIdeImage       = "ide/pycharm"
 	DockerUpImage                = "docker-up"
 	SupervisorImage              = "supervisor"
 	SupervisorPort               = 22999

diff --git a/installer/pkg/config/versions/versions.go b/installer/pkg/config/versions/versions.go
@@ -43,6 +43,7 @@ type Components struct {
 			CodeDesktopImageInsiders Versioned `json:"codeDesktopInsiders"`
 			IntelliJImage            Versioned `json:"intellij"`
 			GoLandImage              Versioned `json:"goland"`
+			PyCharmImage             Versioned `json:"pycharm"`
 		} `json:"desktopIdeImages"`
 	} `json:"workspace"`
 	WSDaemon struct {