Skip to content

Commit b833139

Browse files
authored
chore: Devcontainer updates (#4213)
* Remove Dockerfile and update devcontainer.json configuration * Update docu:start script to specify host in order to be recognized by the container host. * Add postCreateCommand for ARM-based host dependencies
1 parent cfbe3e4 commit b833139

3 files changed

Lines changed: 10 additions & 31 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.203.0/containers/typescript-node
1+
// For configuration details, see https://containers.dev/implementors/json_reference/
32
{
43
"name": "Node.js & TypeScript",
54
"runArgs": ["--init"],
6-
"build": {
7-
"dockerfile": "Dockerfile",
8-
// Update 'VARIANT' to pick a Node version: 16, 14, 12.
9-
// Append -bullseye or -buster to pin to an OS version.
10-
// Use -bullseye variants on local on arm64/Apple Silicon.
11-
"args": {
12-
"VARIANT": "22-bullseye"
13-
}
14-
},
5+
// https://github.com/devcontainers/images/tree/main/src/typescript-node
6+
"image": "mcr.microsoft.com/devcontainers/typescript-node:22-bullseye",
157
"customizations": {
168
"vscode": {
179
"settings": {
@@ -70,15 +62,15 @@
7062
"onAutoForward": "notify"
7163
}
7264
},
73-
"onCreateCommand": "pnpm install && pnpm recursive install --filter ./packages",
65+
"onCreateCommand": "npm install -g pnpm gitmoji-cli && pnpm install && pnpm recursive install --filter ./packages",
66+
// Install additional dependencies for axe linter, especially for devcontainers where the host is ARM-based (e.g., MacBook M1+).
67+
"postCreateCommand": "sudo dpkg --add-architecture amd64 && sudo apt-get update && sudo apt-get install -y libc6:amd64 libstdc++6:amd64 && sudo ln -sf /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2",
7468
"remoteUser": "node",
7569
"features": {
76-
"docker-in-docker": "20.10",
77-
"docker-from-docker": "20.10",
78-
"git": "latest",
70+
"ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {},
7971
"github-cli": "latest",
80-
"ghcr.io/devcontainers/features/sshd:1": {
81-
"version": "latest"
72+
"ghcr.io/devcontainers/features/node:1": {
73+
"version": "22.12.0"
8274
}
8375
}
8476
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"demo:lint": "pnpm --filter eds-demo run lint",
3737
"demo:test:e2e": "pnpm --filter eds-demo run test:e2e",
3838
"docu:clear": "pnpm --filter design-system-docs run clear",
39-
"docu:start": "pnpm --filter ./apps/design-system-docs run start",
4039
"docu:build": "pnpm run extract-prerequisites && pnpm --filter ./apps/design-system-docs run build",
40+
"docu:start": "pnpm --filter ./apps/design-system-docs run start --host 0.0.0.0",
4141
"docu:serve": "pnpm --filter ./apps/design-system-docs run serve",
4242
"palette:dev": "pnpm --filter @equinor/eds-color-palette-generator dev",
4343
"palette:build": "pnpm --filter @equinor/eds-color-palette-generator build",

0 commit comments

Comments
 (0)