Skip to content

Commit 7826291

Browse files
JanKoehnleinroboquat
authored andcommitted
[ide] added VS Code "Insiders" IDE variant
1 parent f74fbca commit 7826291

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

chart/templates/server-deployment.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ functions:
4747
group: inWorkspaceUserAction
4848
{{- end -}}
4949

50+
{{- define "stable-image-full" -}}
51+
{{- $ := .root -}}
52+
{{- $gp := .gp -}}
53+
{{- $comp := .comp -}}
54+
{{ template "gitpod.comp.imageRepo" . }}:{{ $comp.stableVersion }}
55+
{{- end -}}
56+
5057
{{ $comp := .Values.components.server -}}
5158
{{- $this := dict "root" . "gp" $.Values "comp" $comp -}}
5259
{{- $thisWorkspace := dict "root" . "comp" .Values.components.workspace -}}
@@ -157,7 +164,8 @@ spec:
157164
- name: WORKSPACE_DEFAULT_IMAGE
158165
value: "{{ template "gitpod.comp.imageFull" (dict "root" . "gp" $.Values "comp" .Values.components.workspace.defaultImage) }}"
159166
- name: IDE_IMAGE_ALIASES
160-
value: {{ (dict "code" (include "gitpod.comp.imageFull" (dict "root" . "gp" $.Values "comp" .Values.components.workspace.codeImage))) | toJson | quote }}
167+
value: {{ (dict "code-latest" (include "gitpod.comp.imageFull" (dict "root" . "gp" $.Values "comp" .Values.components.workspace.codeImage))
168+
"code" (include "stable-image-full" (dict "root" . "gp" $.Values "comp" .Values.components.workspace.codeImage))) | toJson | quote }}
161169
{{- if $comp.blockNewUsers }}
162170
- name: BLOCK_NEW_USERS
163171
value: {{ $comp.blockNewUsers | quote }}

chart/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ components:
353353
imageName: "ide/theia"
354354
codeImage:
355355
imageName: "ide/code"
356+
stableVersion: "commit-0941a0805dc3c7345c45bd926317eaf045d4b7fb"
356357
supervisor:
357358
imageName: "supervisor"
358359
dockerUp:

components/dashboard/src/settings/Preferences.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import vscode from '../images/vscode.svg';
1414
import { PageWithSubMenu } from "../components/PageWithSubMenu";
1515
import settingsMenu from "./settings-menu";
1616
import AlertBox from "../components/AlertBox";
17+
import Tooltip from "../components/Tooltip";
1718

1819
type Theme = 'light' | 'dark' | 'system';
1920

@@ -54,13 +55,21 @@ export default function Preferences() {
5455
</AlertBox>
5556
<div className="mt-4 space-x-4 flex">
5657
<SelectableCard className="w-36 h-40" title="VS Code" selected={defaultIde === 'code'} onClick={() => actuallySetDefaultIde('code')}>
57-
<div className="flex-grow flex justify-center items-center">
58-
<img className="w-16 filter-grayscale" src={vscode}/>
58+
<div className="flex justify-center mt-3">
59+
<img className="w-16 filter-grayscale self-center" src={vscode} />
5960
</div>
6061
</SelectableCard>
62+
<Tooltip content={'Early access version, still subject to testing.'} >
63+
<SelectableCard className="w-36 h-40" title="VS Code" selected={defaultIde === 'code-latest'} onClick={() => actuallySetDefaultIde('code-latest')}>
64+
<div className="flex justify-center mt-3">
65+
<img className="w-16 filter-grayscale self-center" src={vscode} />
66+
</div>
67+
<span className="mt-2 ml-2 self-center rounded-xl py-0.5 px-2 text-sm bg-orange-100 text-orange-700 dark:bg-orange-600 dark:text-orange-100 font-semibold">LATEST</span>
68+
</SelectableCard>
69+
</Tooltip>
6170
<SelectableCard className="w-36 h-40" title="Theia" selected={defaultIde === 'theia'} onClick={() => actuallySetDefaultIde('theia')}>
62-
<div className="flex-grow flex justify-center items-center">
63-
<img className="w-16 dark:filter-invert" src={theia}/>
71+
<div className="flex justify-center mt-3">
72+
<img className="w-16 h-16 dark:filter-invert self-center" src={theia} />
6473
</div>
6574
</SelectableCard>
6675
</div>

0 commit comments

Comments
 (0)