move composition of ide prebuild tasks in supervisor

gitpod-io · Jun 29, 2023 · 8cd3514 · 8cd3514
1 parent 3f27877
commit 8cd3514
Show file tree

Hide file tree

Showing 24 changed files with 403 additions and 329 deletions.
diff --git a/components/ide/jetbrains/image/create-supervisor-config.js b/components/ide/jetbrains/image/create-supervisor-config.js
@@ -44,6 +44,9 @@ const ideConfigs = [
     ideConfigs.forEach((ideConfig) => {
         const name = ideConfig.name + (qualifier === "stable" ? "" : "-" + qualifier);
         const template = {
+            name: ideConfig.name,
+            displayName: ideConfig.displayName,
+            version: qualifier,
             entrypoint: `/ide-desktop/jb-launcher`,
             entrypointArgs: ["{DESKTOPIDEPORT}", ideConfig.name, `Open in ${ideConfig.displayName}`],
             readinessProbe: {
@@ -63,8 +66,10 @@ const ideConfigs = [
                 GP_EXTERNAL_BROWSER: `/ide-desktop/${name}/bin/idea-cli preview`,
             },
             prebuild: {
-                name: `GITPOD_JB_WARMUP_TASK`,
-                entrypointArgs: ["warmup"],
+                args: ["warmup", ideConfig.name],
+                env: {
+                    JETBRAINS_BACKEND_QUALIFIER: qualifier,
+                },
             },
         };
         fs.writeFileSync(`supervisor-ide-config_${name}.json`, JSON.stringify(template, null, 2), "utf-8");

diff --git a/components/ide/jetbrains/image/leeway.Dockerfile b/components/ide/jetbrains/image/leeway.Dockerfile
@@ -3,19 +3,29 @@
 # See License.AGPL.txt in the project root for license information.
 
 FROM cgr.dev/chainguard/wolfi-base:latest@sha256:5dcb7597e50978fc9dea77d96665bcd47ab0600386710c6e8dab35adf1102122 as base_builder
-RUN mkdir /ide-desktop
+ARG JETBRAINS_DOWNLOAD_QUALIFIER
+ARG SUPERVISOR_IDE_CONFIG
+ARG JETBRAINS_BACKEND_VERSION
+
+RUN apk add --no-cache jq
+
+COPY ${SUPERVISOR_IDE_CONFIG} /tmp/supervisor-ide-config-template.json
+RUN jq --arg JETBRAINS_BACKEND_VERSION "$JETBRAINS_BACKEND_VERSION" '.version = $JETBRAINS_BACKEND_VERSION' /tmp/supervisor-ide-config-template.json > /tmp/supervisor-ide-config.json
+
+RUN mkdir /ide-desktop \
+    && mkdir /ide-desktop/${JETBRAINS_DOWNLOAD_QUALIFIER} \
+    # for backward compatibility with older supervisor, remove in the future
+    && cp /tmp/supervisor-ide-config.json /ide-desktop/supervisor-ide-config.json \
+    && cp /tmp/supervisor-ide-config.json /ide-desktop/${JETBRAINS_DOWNLOAD_QUALIFIER}/supervisor-ide-config.json
 
 # for debugging
 # FROM cgr.dev/chainguard/wolfi-base:latest@sha256:5dcb7597e50978fc9dea77d96665bcd47ab0600386710c6e8dab35adf1102122
 FROM scratch
-ARG JETBRAINS_DOWNLOAD_QUALIFIER
-ARG JETBRAINS_BACKEND_QUALIFIER
 ARG JETBRAINS_BACKEND_VERSION
-ARG SUPERVISOR_IDE_CONFIG
+ARG JETBRAINS_DOWNLOAD_QUALIFIER
 # ensures right permissions for /ide-desktop
 COPY --from=base_builder --chown=33333:33333 /ide-desktop/ /ide-desktop/
-COPY --chown=33333:33333 ${SUPERVISOR_IDE_CONFIG} /ide-desktop/supervisor-ide-config.json
-COPY --chown=33333:33333 components-ide-jetbrains-image--download-${JETBRAINS_DOWNLOAD_QUALIFIER}/backend /ide-desktop/${JETBRAINS_DOWNLOAD_QUALIFIER}/backend
-COPY --chown=33333:33333 components-ide-jetbrains-cli--app/cli /ide-desktop/${JETBRAINS_DOWNLOAD_QUALIFIER}/bin/idea-cli
+COPY components-ide-jetbrains-image--download-${JETBRAINS_DOWNLOAD_QUALIFIER}/backend /ide-desktop/${JETBRAINS_DOWNLOAD_QUALIFIER}/backend
+COPY components-ide-jetbrains-cli--app/cli /ide-desktop/${JETBRAINS_DOWNLOAD_QUALIFIER}/bin/idea-cli
 
 LABEL "io.gitpod.ide.version"=$JETBRAINS_BACKEND_VERSION
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_clion-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_clion-latest.json
@@ -1,4 +1,7 @@
 {
+  "name": "clion",
+  "displayName": "CLion",
+  "version": "latest",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/clion-latest/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "clion"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "latest"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_clion.json b/components/ide/jetbrains/image/supervisor-ide-config_clion.json
@@ -1,4 +1,7 @@
 {
+  "name": "clion",
+  "displayName": "CLion",
+  "version": "stable",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/clion/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "clion"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "stable"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_goland-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_goland-latest.json
@@ -1,4 +1,7 @@
 {
+  "name": "goland",
+  "displayName": "GoLand",
+  "version": "latest",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/goland-latest/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "goland"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "latest"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_goland.json b/components/ide/jetbrains/image/supervisor-ide-config_goland.json
@@ -1,4 +1,7 @@
 {
+  "name": "goland",
+  "displayName": "GoLand",
+  "version": "stable",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/goland/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "goland"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "stable"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_intellij-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_intellij-latest.json
@@ -1,4 +1,7 @@
 {
+  "name": "intellij",
+  "displayName": "IntelliJ IDEA",
+  "version": "latest",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/intellij-latest/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "intellij"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "latest"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_intellij.json b/components/ide/jetbrains/image/supervisor-ide-config_intellij.json
@@ -1,4 +1,7 @@
 {
+  "name": "intellij",
+  "displayName": "IntelliJ IDEA",
+  "version": "stable",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/intellij/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "intellij"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "stable"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_phpstorm-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_phpstorm-latest.json
@@ -1,4 +1,7 @@
 {
+  "name": "phpstorm",
+  "displayName": "PhpStorm",
+  "version": "latest",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/phpstorm-latest/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "phpstorm"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "latest"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_phpstorm.json b/components/ide/jetbrains/image/supervisor-ide-config_phpstorm.json
@@ -1,4 +1,7 @@
 {
+  "name": "phpstorm",
+  "displayName": "PhpStorm",
+  "version": "stable",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/phpstorm/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "phpstorm"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "stable"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_pycharm-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_pycharm-latest.json
@@ -1,4 +1,7 @@
 {
+  "name": "pycharm",
+  "displayName": "PyCharm",
+  "version": "latest",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/pycharm-latest/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "pycharm"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "latest"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_pycharm.json b/components/ide/jetbrains/image/supervisor-ide-config_pycharm.json
@@ -1,4 +1,7 @@
 {
+  "name": "pycharm",
+  "displayName": "PyCharm",
+  "version": "stable",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/pycharm/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "pycharm"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "stable"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_rider-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_rider-latest.json
@@ -1,4 +1,7 @@
 {
+  "name": "rider",
+  "displayName": "Rider",
+  "version": "latest",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/rider-latest/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "rider"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "latest"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_rider.json b/components/ide/jetbrains/image/supervisor-ide-config_rider.json
@@ -1,4 +1,7 @@
 {
+  "name": "rider",
+  "displayName": "Rider",
+  "version": "stable",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/rider/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "rider"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "stable"
+    }
   }
 }
diff --git a/components/ide/jetbrains/image/supervisor-ide-config_rubymine-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_rubymine-latest.json
@@ -1,4 +1,7 @@
 {
+  "name": "rubymine",
+  "displayName": "RubyMine",
+  "version": "latest",
   "entrypoint": "/ide-desktop/jb-launcher",
   "entrypointArgs": [
     "{DESKTOPIDEPORT}",
@@ -22,9 +25,12 @@
     "GP_EXTERNAL_BROWSER": "/ide-desktop/rubymine-latest/bin/idea-cli preview"
   },
   "prebuild": {
-    "name": "GITPOD_JB_WARMUP_TASK",
-    "entrypointArgs": [
-      "warmup"
-    ]
+    "args": [
+      "warmup",
+      "rubymine"
+    ],
+    "env": {
+      "JETBRAINS_BACKEND_QUALIFIER": "latest"
+    }
   }
 }