Skip to content

Commit 8e03cbb

Browse files
authored
Merge branch 'main' into code-server-path
2 parents b62191a + 0022473 commit 8e03cbb

File tree

16 files changed

+44
-13
lines changed

16 files changed

+44
-13
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
node-version: "16"
4040

4141
- name: Install helm
42-
uses: azure/setup-helm@v3.1
42+
uses: azure/setup-helm@v3.3
4343

4444
- name: Fetch dependencies from cache
4545
id: cache-yarn
@@ -523,7 +523,7 @@ jobs:
523523
fetch-depth: 0
524524

525525
- name: Run Trivy vulnerability scanner in repo mode
526-
uses: aquasecurity/trivy-action@0105373003c89c494a3f436bd5efc57f3ac1ca20
526+
uses: aquasecurity/trivy-action@cb606dfdb0d2b3698ace62192088ef4f5360b24f
527527
with:
528528
scan-type: "fs"
529529
scan-ref: "."

.github/workflows/docs-preview.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
branches:
66
- main
7+
paths:
8+
- "docs/**"
79

810
permissions:
911
actions: none

.github/workflows/trivy-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@v3
5252

5353
- name: Run Trivy vulnerability scanner in image mode
54-
uses: aquasecurity/trivy-action@0105373003c89c494a3f436bd5efc57f3ac1ca20
54+
uses: aquasecurity/trivy-action@cb606dfdb0d2b3698ace62192088ef4f5360b24f
5555
with:
5656
image-ref: "docker.io/codercom/code-server:latest"
5757
ignore-unfixed: true

ci/helm-chart/values.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,25 @@ extraContainers: |
147147
# - name: DOCKER_DRIVER
148148
# value: "overlay2"
149149

150+
extraInitContainers: |
151+
# - name: customization
152+
# image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
153+
# imagePullPolicy: IfNotPresent
154+
# env:
155+
# - name: SERVICE_URL
156+
# value: https://open-vsx.org/vscode/gallery
157+
# - name: ITEM_URL
158+
# value: https://open-vsx.org/vscode/item
159+
# command:
160+
# - sh
161+
# - -c
162+
# - |
163+
# code-server --install-extension ms-python.python
164+
# code-server --install-extension golang.Go
165+
# volumeMounts:
166+
# - name: data
167+
# mountPath: /home/coder
168+
150169
## Additional code-server secret mounts
151170
extraSecretMounts: []
152171
# - name: secret-files

docs/assets/images/icons/collab.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

docs/assets/images/icons/faq.svg

Lines changed: 1 addition & 0 deletions
Loading

docs/assets/images/icons/home.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

docs/assets/images/icons/upgrade.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)