From 0172a65ffeb7e6bd90dfbe84bb922d64b9205feb Mon Sep 17 00:00:00 2001 From: atomicgamedev Date: Wed, 16 Oct 2024 23:10:42 +0200 Subject: [PATCH 1/4] Exchange devcontainers-contribf with active repo --- .devcontainer/devcontainer.json | 64 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d74ca64c3..86b5b8cb7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -28,7 +28,7 @@ "ghcr.io/devcontainers-contrib/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" }, @@ -58,9 +58,9 @@ "username": "node" } }, - "customizations": { - "vscode": { - "extensions": [ + "customizations": { + "vscode": { + "extensions": [ "AlexShen.classdiagram-ts", "christian-kohler.npm-intellisense", "DavidAnson.vscode-markdownlin", @@ -74,35 +74,35 @@ "VisualStudioExptTeam.vscodeintellicode", "vscode-icons-team.vscode-icons" ], - "settings": { - "editor.tabSize": 2, - "terminal.integrated.defaultProfile.linux": "zsh", - "terminal.integrated.profiles.linux": { - "bash": { - "path": "bash", - "icon": "terminal-bash" - }, - "zsh": { - "path": "zsh" - }, - "tmux": { - "path": "tmux", - "icon": "terminal-tmux" - }, - "pwsh": { - "path": "pwsh", - "icon": "terminal-powershell" - } - } - } - } - }, + "settings": { + "editor.tabSize": 2, + "terminal.integrated.defaultProfile.linux": "zsh", + "terminal.integrated.profiles.linux": { + "bash": { + "path": "bash", + "icon": "terminal-bash" + }, + "zsh": { + "path": "zsh" + }, + "tmux": { + "path": "tmux", + "icon": "terminal-tmux" + }, + "pwsh": { + "path": "pwsh", + "icon": "terminal-powershell" + } + } + } + } + }, "forwardPorts": [ - 4000, //react client - 4001, // lib microservice - 5000, // DT runner - 8000 // mkdocs + 4000, //react client + 4001, // lib microservice + 5000, // DT runner + 8000 // mkdocs ] } // Execute after login: -// source /usr/share/powerline/bindings/zsh/powerline.zsh +// source /usr/share/powerline/bindings/zsh/powerline.zsh \ No newline at end of file From f6f0c616827aed05c7131d30e73d87575d2aa920 Mon Sep 17 00:00:00 2001 From: atomicgamedev Date: Wed, 16 Oct 2024 23:49:33 +0200 Subject: [PATCH 2/4] Reformat to previous style --- .devcontainer/devcontainer.json | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 86b5b8cb7..523703f3c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -58,9 +58,9 @@ "username": "node" } }, - "customizations": { - "vscode": { - "extensions": [ + "customizations": { + "vscode": { + "extensions": [ "AlexShen.classdiagram-ts", "christian-kohler.npm-intellisense", "DavidAnson.vscode-markdownlin", @@ -74,34 +74,34 @@ "VisualStudioExptTeam.vscodeintellicode", "vscode-icons-team.vscode-icons" ], - "settings": { - "editor.tabSize": 2, - "terminal.integrated.defaultProfile.linux": "zsh", - "terminal.integrated.profiles.linux": { - "bash": { - "path": "bash", - "icon": "terminal-bash" - }, - "zsh": { - "path": "zsh" - }, - "tmux": { - "path": "tmux", - "icon": "terminal-tmux" - }, - "pwsh": { - "path": "pwsh", - "icon": "terminal-powershell" - } - } - } - } - }, + "settings": { + "editor.tabSize": 2, + "terminal.integrated.defaultProfile.linux": "zsh", + "terminal.integrated.profiles.linux": { + "bash": { + "path": "bash", + "icon": "terminal-bash" + }, + "zsh": { + "path": "zsh" + }, + "tmux": { + "path": "tmux", + "icon": "terminal-tmux" + }, + "pwsh": { + "path": "pwsh", + "icon": "terminal-powershell" + } + } + } + } + }, "forwardPorts": [ - 4000, //react client - 4001, // lib microservice - 5000, // DT runner - 8000 // mkdocs + 4000, //react client + 4001, // lib microservice + 5000, // DT runner + 8000 // mkdocs ] } // Execute after login: From c336b3557decdbc8bc41a7db72271588b702203c Mon Sep 17 00:00:00 2001 From: atomicgamedev Date: Thu, 17 Oct 2024 17:58:37 +0200 Subject: [PATCH 3/4] Upgrade image and features with maintained repo --- .devcontainer/devcontainer.json | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 523703f3c..1d64a7f9c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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, @@ -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-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" From 496fe09bfe8cf1afd5c856dda22a6bad45fe78b8 Mon Sep 17 00:00:00 2001 From: atomicgamedev Date: Fri, 18 Oct 2024 19:22:35 +0000 Subject: [PATCH 4/4] Increment test beforeAll timeout to 12 seconds --- servers/lib/test/e2e/app.e2e.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/lib/test/e2e/app.e2e.spec.ts b/servers/lib/test/e2e/app.e2e.spec.ts index 0c7eb9a49..9b8152950 100644 --- a/servers/lib/test/e2e/app.e2e.spec.ts +++ b/servers/lib/test/e2e/app.e2e.spec.ts @@ -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();