Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes the stalling dev container #989

Open
wants to merge 4 commits into
base: feature/distributed-demo
Choose a base branch
from
Open

Fixes the stalling dev container #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0172a65
Exchange devcontainers-contribf with active repo
atomicgamedeveloper Oct 16, 2024
f6f0c61
Reformat to previous style
atomicgamedeveloper Oct 16, 2024
c336b35
Upgrade image and features with maintained repo
atomicgamedeveloper Oct 17, 2024
496fe09
Increment test beforeAll timeout to 12 seconds
atomicgamedeveloper Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
{
"name": "Digital Twin as a Service",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bullseye",
"image": "mcr.microsoft.com/devcontainers/typescript-node:22-bullseye",
"features": {
"ghcr.io/devcontainers-contrib/features/apt-get-packages:1": {
"ghcr.io/devcontainers-extra/features/apt-get-packages:1": {
"version": "latest",
"clean_ppas": true,
"preserve_apt_list": true,
"packages": "curl graphviz htop net-tools powerline"
},
"ghcr.io/devcontainers/features/common-utils:2": {
"version": "latest",
"installZsh": true,
"configureZshAsDefaultShell": true,
"installOhMyZsh": true,
Expand All @@ -19,40 +21,45 @@
"userUid": "1001",
"userGid": "automatic"
},
"ghcr.io/devcontainers-contrib/features/exa:1": {
"ghcr.io/devcontainers-extra/features/exa:1": {
"version": "latest"
},
"ghcr.io/devcontainers/features/git:1": {
"version": "os-provided"
},
"ghcr.io/devcontainers-contrib/features/markdownlint-cli:1": {
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/mkdocs:2": {
"ghcr.io/devcontainers-extra/features/mkdocs:2": {
"version": "latest",
"plugins": "mkdocs-material pymdown-extensions mkdocstrings[crystal,python] mkdocs-monorepo-plugin mkdocs-pdf-export-plugin mkdocs-awesome-pages-plugin python-markdown-math mkdocs-open-in-new-tab mkdocs-with-pdf qrcode"
},
"ghcr.io/devcontainers-contrib/features/nestjs-cli:2": {
"ghcr.io/devcontainers-extra/features/nestjs-cli:2": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/npm-package:1": {
"ghcr.io/devcontainers-extra/features/npm-package:1": {
"package": "madge"
},
"ghcr.io/devcontainers-contrib/features/pipx-package:1": {},
"ghcr.io/devcontainers-contrib/features/poetry:2": {
"ghcr.io/devcontainers-extra/features/pipx-package:1": {
"version": "latest"
},
"ghcr.io/devcontainers-extra/features/poetry:2": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/pre-commit:2": {
"ghcr.io/devcontainers-extra/features/pre-commit:2": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/tmux-apt-get:1": {},
"ghcr.io/devcontainers-contrib/features/typescript:2": {
"ghcr.io/devcontainers-extra/features/tmux-apt-get:1": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/vercel-serve:1": {
"ghcr.io/devcontainers-extra/features/typescript:2": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/zsh-plugins:0": {
"ghcr.io/devcontainers-extra/features/vercel-serve:1": {
"version": "latest"
},
"ghcr.io/devcontainers-extra/features/zsh-plugins:0": {
"version": "latest",
"plugins": "ssh-agent npm zsh-autosuggestions",
"omzPlugins": "https://github.com/zsh-users/zsh-autosuggestions",
"username": "node"
Expand Down Expand Up @@ -105,4 +112,4 @@
]
}
// Execute after login:
// source /usr/share/powerline/bindings/zsh/powerline.zsh
// source /usr/share/powerline/bindings/zsh/powerline.zsh
2 changes: 1 addition & 1 deletion servers/lib/test/e2e/app.e2e.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('End to End test for the application', () => {

// eslint-disable-next-line no-promise-executor-return
await new Promise((resolve) => setTimeout(resolve, 4000));
}, 10000);
}, 12000);

afterAll(async () => {
await app.close();
Expand Down
Loading