Skip to content

Commit 64539bf

Browse files
corneliusludmannroboquat
authored andcommitted
[jetbrains] Add PyCharm IDE
1 parent 6f0f32e commit 64539bf

File tree

8 files changed

+53
-0
lines changed

8 files changed

+53
-0
lines changed

chart/templates/server-ide-configmap.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,13 @@ options:
9898
label: "EAP"
9999
notes: ["While in beta, when you open a workspace with GoLand you will need to use the password “gitpod”."]
100100
image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.goland)) }}
101+
pycharm:
102+
orderKey: "06"
103+
title: "PyCharm"
104+
type: "desktop"
105+
logo: "https://upload.wikimedia.org/wikipedia/commons/1/1d/PyCharm_Icon.svg"
106+
notes: ["While in beta, when you open a workspace with PyCharm you will need to use the password “gitpod”."]
107+
image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.pycharm)) }}
101108

102109
defaultIde: "code"
103110
defaultDesktopIde: "code-desktop"

chart/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,8 @@ components:
410410
imageName: "ide/intellij"
411411
goland:
412412
imageName: "ide/goland"
413+
pycharm:
414+
imageName: "ide/pycharm"
413415
supervisor:
414416
imageName: "supervisor"
415417
dockerUp:

components/BUILD.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ packages:
4444
- components/ide/code-desktop:docker-insiders
4545
- components/ide/jetbrains/image:intellij
4646
- components/ide/jetbrains/image:goland
47+
- components/ide/jetbrains/image:pycharm
4748
- components/ide/theia:docker
4849
- components/image-builder:docker
4950
- components/image-builder-mk3:docker

components/ide/jetbrains/image/BUILD.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ packages:
66
deps:
77
- :intellij
88
- :goland
9+
- :pycharm
910
- name: intellij
1011
type: docker
1112
srcs:
@@ -48,3 +49,24 @@ packages:
4849
image:
4950
- ${imageRepoBase}/ide/goland:${version}
5051
- ${imageRepoBase}/ide/goland:commit-${__git_commit}
52+
- name: pycharm
53+
type: docker
54+
srcs:
55+
- "startup.sh"
56+
- "supervisor-ide-config_pycharm.json"
57+
- "status/go.mod"
58+
- "status/main.go"
59+
deps:
60+
- components/ide/jetbrains/backend-plugin:plugin
61+
argdeps:
62+
- imageRepoBase
63+
config:
64+
dockerfile: leeway.Dockerfile
65+
metadata:
66+
helm-component: workspace.desktopIdeImages.pycharm
67+
buildArgs:
68+
JETBRAINS_BACKEND_URL: "https://download.jetbrains.com/python/pycharm-professional-2021.3.tar.gz"
69+
SUPERVISOR_IDE_CONFIG: supervisor-ide-config_pycharm.json
70+
image:
71+
- ${imageRepoBase}/ide/pycharm:${version}
72+
- ${imageRepoBase}/ide/pycharm:commit-${__git_commit}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"entrypoint": "/ide-desktop/startup.sh",
3+
"entrypointArgs": [ "Open in PyCharm" ],
4+
"readinessProbe": {
5+
"type": "http",
6+
"http": {
7+
"port": 24000,
8+
"path": "/status"
9+
}
10+
}
11+
}

installer/pkg/components/server/ide-configmap.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ func ideconfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
9797
Notes: []string{"While in beta, when you open a workspace with GoLand you will need to use the password “gitpod”."},
9898
Image: common.ImageName(ctx.Config.Repository, workspace.GoLandDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandImage.Version),
9999
},
100+
"pycharm": {
101+
OrderKey: pointer.String("06"),
102+
Title: "PyCharm",
103+
Type: typeDesktop,
104+
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.
105+
Notes: []string{"While in beta, when you open a workspace with PyCharm you will need to use the password “gitpod”."},
106+
Image: common.ImageName(ctx.Config.Repository, workspace.PyCharmDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandImage.Version),
107+
},
100108
},
101109
DefaultIDE: "code",
102110
DefaultDesktopIDE: "code-desktop",

installer/pkg/components/workspace/constants.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const (
1515
CodeDesktopInsidersIDEImage = "ide/code-desktop-insiders"
1616
IntelliJDesktopIDEImage = "ide/intellij"
1717
GoLandDesktopIdeImage = "ide/goland"
18+
PyCharmDesktopIdeImage = "ide/pycharm"
1819
DockerUpImage = "docker-up"
1920
SupervisorImage = "supervisor"
2021
SupervisorPort = 22999

installer/pkg/config/versions/versions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ type Components struct {
4343
CodeDesktopImageInsiders Versioned `json:"codeDesktopInsiders"`
4444
IntelliJImage Versioned `json:"intellij"`
4545
GoLandImage Versioned `json:"goland"`
46+
PyCharmImage Versioned `json:"pycharm"`
4647
} `json:"desktopIdeImages"`
4748
} `json:"workspace"`
4849
WSDaemon struct {

0 commit comments

Comments
 (0)