Skip to content

Commit 43bb257

Browse files
authored
chore(devcontainer): use node from features + update images (#2827)
* chore(devcontainer): use node from features * chore(devcontainer): add 4.0 and update the rest
1 parent 7eda574 commit 43bb257

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2424
&& apt-get clean \
2525
&& rm -rf /var/lib/apt/lists/*
2626

27-
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
28-
29-
RUN apt-get update && apt-get install -y --no-install-recommends \
30-
nodejs \
31-
chromium \
32-
chromium-driver \
33-
&& apt-get clean \
34-
&& rm -rf /var/lib/apt/lists/*
35-
3627
RUN echo "sentry ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/sentry \
3728
&& chmod 0440 /etc/sudoers.d/sentry
3829

.devcontainer/devcontainer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
"features": {
77
"ghcr.io/devcontainers/features/github-cli": {},
88
"ghcr.io/nils-geistmann/devcontainers-features/zsh": {},
9+
"ghcr.io/devcontainers/features/node:1": {},
910
"ghcr.io/devcontainers-extra/features/npm-packages": {},
11+
"ghcr.io/devcontainers/features/copilot-cli:1": {},
1012
"ghcr.io/rocker-org/devcontainer-features/apt-packages": {
1113
"packages": "inotify-tools"
1214
}
1315
},
1416
"customizations": {
1517
"vscode": {
16-
"extensions": [
17-
"sleistner.vscode-fileutils",
18-
"Shopify.ruby-lsp"
19-
],
18+
"extensions": ["sleistner.vscode-fileutils", "Shopify.ruby-lsp"],
2019
"editor.formatOnSaveMode": "modifications",
2120
"editor.formatOnSave": true,
2221
"rubyLsp.rubyVersionManager": {

.github/workflows/build_images.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
- ruby:2.7.8-slim-bullseye
2929
- ruby:3.0.7-slim-bullseye
3030
- ruby:3.1.7-slim-bookworm
31-
- ruby:3.2.9-slim-bookworm
32-
- ruby:3.3.9-slim-bookworm
33-
- ruby:3.4.5-slim-bookworm
31+
- ruby:3.2.9-slim-trixie
32+
- ruby:3.3.10-slim-trixie
33+
- ruby:3.4.8-slim-trixie
34+
- ruby:4.0.0-slim-trixie
3435

3536
steps:
3637
- name: Check out current commit
@@ -67,8 +68,8 @@ jobs:
6768
id: build
6869
uses: getsentry/action-build-and-push-images@main
6970
with:
70-
image_name: '${{ steps.image_name.outputs.short_name }}'
71-
dockerfile_path: '.devcontainer/Dockerfile'
71+
image_name: "${{ steps.image_name.outputs.short_name }}"
72+
dockerfile_path: ".devcontainer/Dockerfile"
7273
ghcr: true
7374
publish_on_pr: true
7475
build_args: |

spec/apps/svelte-mini/package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)