Skip to content

Commit 4c7f698

Browse files
akosyakovakosyakov
committed
[jb] split backend and plugin images
1 parent ed1458a commit 4c7f698

File tree

19 files changed

+262
-79
lines changed

19 files changed

+262
-79
lines changed

‎components/BUILD.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ packages:
4242
- components/ide/code-desktop:docker
4343
- components/ide/code-desktop:docker-insiders
4444
- components/ide/code:docker
45+
- components/ide/jetbrains/backend-plugin:stable
46+
- components/ide/jetbrains/backend-plugin:latest
4547
- components/ide/jetbrains/image:goland
4648
- components/ide/jetbrains/image:goland-latest
4749
- components/ide/jetbrains/image:intellij

‎components/ide/jetbrains/backend-plugin/BUILD.yaml

+36
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,40 @@
11
packages:
2+
- name: docker
3+
type: generic
4+
argdeps:
5+
- version
6+
deps:
7+
- :stable
8+
- :latest
9+
- name: stable
10+
type: docker
11+
deps:
12+
- :plugin-stable
13+
argdeps:
14+
- imageRepoBase
15+
config:
16+
dockerfile: leeway.Dockerfile
17+
metadata:
18+
helm-component: workspace.desktopIdeImages.jbBackendPlugin
19+
buildArgs:
20+
JETBRAINS_BACKEND_QUALIFIER: stable
21+
image:
22+
- ${imageRepoBase}/ide/jb-backend-plugin:commit-${__git_commit}
23+
- name: latest
24+
type: docker
25+
deps:
26+
- :plugin-latest
27+
argdeps:
28+
- imageRepoBase
29+
config:
30+
dockerfile: leeway.Dockerfile
31+
metadata:
32+
helm-component: workspace.desktopIdeImages.jbBackendPluginLatest
33+
buildArgs:
34+
JETBRAINS_BACKEND_QUALIFIER: latest
35+
image:
36+
- ${imageRepoBase}/ide/jb-backend-plugin:${version}
37+
- ${imageRepoBase}/ide/jb-backend-plugin:commit-${__git_commit}-latest
238
- name: plugin-stable
339
type: generic
440
deps:

‎components/ide/jetbrains/backend-plugin/leeway.Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright (c) 2021 Gitpod GmbH. All rights reserved.
2+
# Licensed under the GNU Affero General Public License (AGPL).
3+
# See License-AGPL.txt in the project root for license information.
4+
5+
# for debugging
6+
# FROM alpine:3.16
7+
FROM scratch
8+
ARG JETBRAINS_BACKEND_QUALIFIER
9+
COPY --chown=33333:33333 components-ide-jetbrains-backend-plugin--plugin-${JETBRAINS_BACKEND_QUALIFIER}/build/gitpod-remote /ide-desktop/backend/plugins/gitpod-remote

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

-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ packages:
1818
- "startup.sh"
1919
- "supervisor-ide-config_intellij.json"
2020
deps:
21-
- components/ide/jetbrains/backend-plugin:plugin-stable
2221
- components/ide/jetbrains/image/status:app
2322
- components/ide/jetbrains/image/download:intellij
2423
- components/ide/jetbrains/cli:app
@@ -40,7 +39,6 @@ packages:
4039
- "startup.sh"
4140
- "supervisor-ide-config_intellij.json"
4241
deps:
43-
- components/ide/jetbrains/backend-plugin:plugin-latest
4442
- components/ide/jetbrains/image/status:app
4543
- components/ide/jetbrains/image/download:intellij-latest
4644
- components/ide/jetbrains/cli:app
@@ -63,7 +61,6 @@ packages:
6361
- "startup.sh"
6462
- "supervisor-ide-config_goland.json"
6563
deps:
66-
- components/ide/jetbrains/backend-plugin:plugin-stable
6764
- components/ide/jetbrains/image/status:app
6865
- components/ide/jetbrains/image/download:goland
6966
- components/ide/jetbrains/cli:app
@@ -85,7 +82,6 @@ packages:
8582
- "startup.sh"
8683
- "supervisor-ide-config_goland.json"
8784
deps:
88-
- components/ide/jetbrains/backend-plugin:plugin-latest
8985
- components/ide/jetbrains/image/status:app
9086
- components/ide/jetbrains/image/download:goland-latest
9187
- components/ide/jetbrains/cli:app
@@ -108,7 +104,6 @@ packages:
108104
- "startup.sh"
109105
- "supervisor-ide-config_pycharm.json"
110106
deps:
111-
- components/ide/jetbrains/backend-plugin:plugin-stable
112107
- components/ide/jetbrains/image/status:app
113108
- components/ide/jetbrains/image/download:pycharm
114109
- components/ide/jetbrains/cli:app
@@ -130,7 +125,6 @@ packages:
130125
- "startup.sh"
131126
- "supervisor-ide-config_pycharm.json"
132127
deps:
133-
- components/ide/jetbrains/backend-plugin:plugin-latest
134128
- components/ide/jetbrains/image/status:app
135129
- components/ide/jetbrains/image/download:pycharm-latest
136130
- components/ide/jetbrains/cli:app
@@ -153,7 +147,6 @@ packages:
153147
- "startup.sh"
154148
- "supervisor-ide-config_phpstorm.json"
155149
deps:
156-
- components/ide/jetbrains/backend-plugin:plugin-stable
157150
- components/ide/jetbrains/image/status:app
158151
- components/ide/jetbrains/image/download:phpstorm
159152
- components/ide/jetbrains/cli:app
@@ -175,7 +168,6 @@ packages:
175168
- "startup.sh"
176169
- "supervisor-ide-config_phpstorm.json"
177170
deps:
178-
- components/ide/jetbrains/backend-plugin:plugin-latest
179171
- components/ide/jetbrains/image/status:app
180172
- components/ide/jetbrains/image/download:phpstorm-latest
181173
- components/ide/jetbrains/cli:app

‎components/ide/jetbrains/image/leeway.Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ARG SUPERVISOR_IDE_CONFIG
1111
COPY --chown=33333:33333 ${SUPERVISOR_IDE_CONFIG} /ide-desktop/supervisor-ide-config.json
1212
COPY --chown=33333:33333 startup.sh /ide-desktop/
1313
COPY --chown=33333:33333 components-ide-jetbrains-image-download--${JETBRAINS_DOWNLOAD_QUALIFIER}/backend /ide-desktop/backend
14-
COPY --chown=33333:33333 components-ide-jetbrains-backend-plugin--plugin-${JETBRAINS_BACKEND_QUALIFIER}/build/gitpod-remote /ide-desktop/backend/plugins/gitpod-remote
1514
COPY --chown=33333:33333 components-ide-jetbrains-image-status--app/status /ide-desktop
1615

1716
ARG JETBRAINS_BACKEND_QUALIFIER

‎install/installer/cmd/testdata/render/aws-setup/output.golden

+18-4
Original file line numberDiff line numberDiff line change
@@ -1445,6 +1445,12 @@ data:
14451445
},
14461446
"phpstormLatest": {
14471447
"version": "test"
1448+
},
1449+
"jbBackendPlugin": {
1450+
"version": "test"
1451+
},
1452+
"jbBackendPluginLatest": {
1453+
"version": "test"
14481454
}
14491455
}
14501456
},
@@ -3546,31 +3552,39 @@ data:
35463552
"type": "desktop",
35473553
"logo": "https://ide.gitpod.example.com/image/ide-logo/golandLogo.svg",
35483554
"image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test",
3549-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest"
3555+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest",
3556+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3557+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
35503558
},
35513559
"intellij": {
35523560
"orderKey": "04",
35533561
"title": "IntelliJ IDEA",
35543562
"type": "desktop",
35553563
"logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg",
35563564
"image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test",
3557-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest"
3565+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest",
3566+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3567+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
35583568
},
35593569
"phpstorm": {
35603570
"orderKey": "07",
35613571
"title": "PhpStorm",
35623572
"type": "desktop",
35633573
"logo": "https://ide.gitpod.example.com/image/ide-logo/phpstormLogo.svg",
35643574
"image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test",
3565-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest"
3575+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest",
3576+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3577+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
35663578
},
35673579
"pycharm": {
35683580
"orderKey": "06",
35693581
"title": "PyCharm",
35703582
"type": "desktop",
35713583
"logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg",
35723584
"image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test",
3573-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest"
3585+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest",
3586+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3587+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
35743588
}
35753589
},
35763590
"defaultIde": "code",

‎install/installer/cmd/testdata/render/azure-setup/output.golden

+18-4
Original file line numberDiff line numberDiff line change
@@ -1403,6 +1403,12 @@ data:
14031403
},
14041404
"phpstormLatest": {
14051405
"version": "test"
1406+
},
1407+
"jbBackendPlugin": {
1408+
"version": "test"
1409+
},
1410+
"jbBackendPluginLatest": {
1411+
"version": "test"
14061412
}
14071413
}
14081414
},
@@ -3410,31 +3416,39 @@ data:
34103416
"type": "desktop",
34113417
"logo": "https://ide.gitpod.example.com/image/ide-logo/golandLogo.svg",
34123418
"image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test",
3413-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest"
3419+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest",
3420+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3421+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
34143422
},
34153423
"intellij": {
34163424
"orderKey": "04",
34173425
"title": "IntelliJ IDEA",
34183426
"type": "desktop",
34193427
"logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg",
34203428
"image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test",
3421-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest"
3429+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest",
3430+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3431+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
34223432
},
34233433
"phpstorm": {
34243434
"orderKey": "07",
34253435
"title": "PhpStorm",
34263436
"type": "desktop",
34273437
"logo": "https://ide.gitpod.example.com/image/ide-logo/phpstormLogo.svg",
34283438
"image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test",
3429-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest"
3439+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest",
3440+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3441+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
34303442
},
34313443
"pycharm": {
34323444
"orderKey": "06",
34333445
"title": "PyCharm",
34343446
"type": "desktop",
34353447
"logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg",
34363448
"image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test",
3437-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest"
3449+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest",
3450+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3451+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
34383452
}
34393453
},
34403454
"defaultIde": "code",

‎install/installer/cmd/testdata/render/customization/output.golden

+18-4
Original file line numberDiff line numberDiff line change
@@ -1655,6 +1655,12 @@ data:
16551655
},
16561656
"phpstormLatest": {
16571657
"version": "test"
1658+
},
1659+
"jbBackendPlugin": {
1660+
"version": "test"
1661+
},
1662+
"jbBackendPluginLatest": {
1663+
"version": "test"
16581664
}
16591665
}
16601666
},
@@ -4322,31 +4328,39 @@ data:
43224328
"type": "desktop",
43234329
"logo": "https://ide.gitpod.example.com/image/ide-logo/golandLogo.svg",
43244330
"image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test",
4325-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest"
4331+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest",
4332+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
4333+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
43264334
},
43274335
"intellij": {
43284336
"orderKey": "04",
43294337
"title": "IntelliJ IDEA",
43304338
"type": "desktop",
43314339
"logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg",
43324340
"image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test",
4333-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest"
4341+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest",
4342+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
4343+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
43344344
},
43354345
"phpstorm": {
43364346
"orderKey": "07",
43374347
"title": "PhpStorm",
43384348
"type": "desktop",
43394349
"logo": "https://ide.gitpod.example.com/image/ide-logo/phpstormLogo.svg",
43404350
"image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test",
4341-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest"
4351+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest",
4352+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
4353+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
43424354
},
43434355
"pycharm": {
43444356
"orderKey": "06",
43454357
"title": "PyCharm",
43464358
"type": "desktop",
43474359
"logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg",
43484360
"image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test",
4349-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest"
4361+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest",
4362+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
4363+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
43504364
}
43514365
},
43524366
"defaultIde": "code",

‎install/installer/cmd/testdata/render/external-registry/output.golden

+18-4
Original file line numberDiff line numberDiff line change
@@ -1450,6 +1450,12 @@ data:
14501450
},
14511451
"phpstormLatest": {
14521452
"version": "test"
1453+
},
1454+
"jbBackendPlugin": {
1455+
"version": "test"
1456+
},
1457+
"jbBackendPluginLatest": {
1458+
"version": "test"
14531459
}
14541460
}
14551461
},
@@ -3597,31 +3603,39 @@ data:
35973603
"type": "desktop",
35983604
"logo": "https://ide.gitpod.example.com/image/ide-logo/golandLogo.svg",
35993605
"image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test",
3600-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest"
3606+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest",
3607+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3608+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
36013609
},
36023610
"intellij": {
36033611
"orderKey": "04",
36043612
"title": "IntelliJ IDEA",
36053613
"type": "desktop",
36063614
"logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg",
36073615
"image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test",
3608-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest"
3616+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest",
3617+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3618+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
36093619
},
36103620
"phpstorm": {
36113621
"orderKey": "07",
36123622
"title": "PhpStorm",
36133623
"type": "desktop",
36143624
"logo": "https://ide.gitpod.example.com/image/ide-logo/phpstormLogo.svg",
36153625
"image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test",
3616-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest"
3626+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest",
3627+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3628+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
36173629
},
36183630
"pycharm": {
36193631
"orderKey": "06",
36203632
"title": "PyCharm",
36213633
"type": "desktop",
36223634
"logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg",
36233635
"image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test",
3624-
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest"
3636+
"latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest",
3637+
"pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test",
3638+
"pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest"
36253639
}
36263640
},
36273641
"defaultIde": "code",

0 commit comments

Comments
 (0)