From 371145d3bce0655070d0436a0eb30d5300de364b Mon Sep 17 00:00:00 2001 From: Simon Graband Date: Wed, 4 Dec 2024 13:44:42 +0100 Subject: [PATCH] Cleanup dockerfiles and update monitor-theia demo to 1.56.0 Contributed on behalf of STMicroelectronics Signed-off-by: Simon Graband --- .github/workflows/publish-demos.yml | 2 +- demo/dockerfiles/demo-theia-docker/Dockerfile | 1 - .../demo-theia-monitor-theia/Dockerfile | 1 - .../demo-theia-monitor-theia/package.json | 107 ++++++++---------- 4 files changed, 51 insertions(+), 60 deletions(-) diff --git a/.github/workflows/publish-demos.yml b/.github/workflows/publish-demos.yml index 62bc2c89..471bb086 100644 --- a/.github/workflows/publish-demos.yml +++ b/.github/workflows/publish-demos.yml @@ -12,7 +12,7 @@ on: type: boolean required: true publish_theia_cloud_activity_demo: - description: "Publishtheia-cloud-activity-demo?" + description: "Publish theia-cloud-activity-demo?" type: boolean required: true diff --git a/demo/dockerfiles/demo-theia-docker/Dockerfile b/demo/dockerfiles/demo-theia-docker/Dockerfile index 11937ce9..eb4c368c 100644 --- a/demo/dockerfiles/demo-theia-docker/Dockerfile +++ b/demo/dockerfiles/demo-theia-docker/Dockerfile @@ -6,7 +6,6 @@ ENV THEIA_WEBVIEW_ENDPOINT {{hostname}} # Copy project COPY --chown=theia:theia project /home/project COPY --chown=theia:theia settings.json /home/theia/theia-blueprint/applications/browser/.theia/settings.json -COPY --chown=theia:theia settings.json /home/theia/theia-blueprint/applications/browser/.theia/settings.json # Build projects once RUN mvn clean verify -f /home/project/java/pom.xml && \ diff --git a/demo/dockerfiles/demo-theia-monitor-theia/Dockerfile b/demo/dockerfiles/demo-theia-monitor-theia/Dockerfile index 283c24ef..fd8e1cbb 100644 --- a/demo/dockerfiles/demo-theia-monitor-theia/Dockerfile +++ b/demo/dockerfiles/demo-theia-monitor-theia/Dockerfile @@ -8,7 +8,6 @@ ADD node ./node WORKDIR /home/theia/node RUN npm ci && npm run build -w monitor-theia WORKDIR /home/theia -RUN sed -i 's/"@eclipse-theiacloud\/monitor-theia": "next"/"@eclipse-theiacloud\/monitor-theia": "file:node\/monitor-theia"/' package.json RUN yarn --pure-lockfile && \ NODE_OPTIONS="--max_old_space_size=4096" yarn theia build && \ diff --git a/demo/dockerfiles/demo-theia-monitor-theia/package.json b/demo/dockerfiles/demo-theia-monitor-theia/package.json index 85c370dd..2760abb8 100644 --- a/demo/dockerfiles/demo-theia-monitor-theia/package.json +++ b/demo/dockerfiles/demo-theia-monitor-theia/package.json @@ -17,50 +17,50 @@ } }, "dependencies": { - "@theia/bulk-edit": "1.43.1", - "@theia/callhierarchy": "1.43.1", - "@theia/console": "1.43.1", - "@theia/core": "1.43.1", - "@theia/debug": "1.43.1", - "@theia/editor": "1.43.1", - "@theia/editor-preview": "1.43.1", - "@theia/electron": "1.43.1", - "@theia/external-terminal": "1.43.1", - "@theia/file-search": "1.43.1", - "@theia/filesystem": "1.43.1", - "@theia/getting-started": "1.43.1", - "@theia/keymaps": "1.43.1", - "@theia/markers": "1.43.1", - "@theia/messages": "1.43.1", - "@theia/metrics": "1.43.1", - "@theia/mini-browser": "1.43.1", - "@theia/monaco": "1.43.1", - "@theia/navigator": "1.43.1", - "@theia/outline-view": "1.43.1", - "@theia/output": "1.43.1", - "@theia/plugin-dev": "1.43.1", - "@theia/plugin-ext": "1.43.1", - "@theia/plugin-ext-vscode": "1.43.1", - "@theia/preferences": "1.43.1", - "@theia/process": "1.43.1", - "@theia/property-view": "1.43.1", - "@theia/scm": "1.43.1", - "@theia/scm-extra": "1.43.1", - "@theia/search-in-workspace": "1.43.1", - "@theia/task": "1.43.1", - "@theia/terminal": "1.43.1", - "@theia/test": "1.43.1", - "@theia/timeline": "1.43.1", - "@theia/toolbar": "1.43.1", - "@theia/typehierarchy": "1.43.1", - "@theia/userstorage": "1.43.1", - "@theia/variable-resolver": "1.43.1", - "@theia/vsx-registry": "1.43.1", - "@theia/workspace": "1.43.1", - "@eclipse-theiacloud/monitor-theia": "next" + "@theia/bulk-edit": "1.56.0", + "@theia/callhierarchy": "1.56.0", + "@theia/console": "1.56.0", + "@theia/core": "1.56.0", + "@theia/debug": "1.56.0", + "@theia/editor": "1.56.0", + "@theia/editor-preview": "1.56.0", + "@theia/electron": "1.56.0", + "@theia/external-terminal": "1.56.0", + "@theia/file-search": "1.56.0", + "@theia/filesystem": "1.56.0", + "@theia/getting-started": "1.56.0", + "@theia/keymaps": "1.56.0", + "@theia/markers": "1.56.0", + "@theia/messages": "1.56.0", + "@theia/metrics": "1.56.0", + "@theia/mini-browser": "1.56.0", + "@theia/monaco": "1.56.0", + "@theia/navigator": "1.56.0", + "@theia/outline-view": "1.56.0", + "@theia/output": "1.56.0", + "@theia/plugin-dev": "1.56.0", + "@theia/plugin-ext": "1.56.0", + "@theia/plugin-ext-vscode": "1.56.0", + "@theia/preferences": "1.56.0", + "@theia/process": "1.56.0", + "@theia/property-view": "1.56.0", + "@theia/scm": "1.56.0", + "@theia/scm-extra": "1.56.0", + "@theia/search-in-workspace": "1.56.0", + "@theia/task": "1.56.0", + "@theia/terminal": "1.56.0", + "@theia/test": "1.56.0", + "@theia/timeline": "1.56.0", + "@theia/toolbar": "1.56.0", + "@theia/typehierarchy": "1.56.0", + "@theia/userstorage": "1.56.0", + "@theia/variable-resolver": "1.56.0", + "@theia/vsx-registry": "1.56.0", + "@theia/workspace": "1.56.0", + "@eclipse-theiacloud/monitor-theia": "file:node/monitor-theia" }, "devDependencies": { - "@theia/cli": "1.43.1" + "@theia/cli": "1.56.0" }, "resolutions": { "inversify": "6.0.3" @@ -70,23 +70,16 @@ }, "theiaPluginsDir": "plugins", "theiaPlugins": { - "vscode.git": "https://open-vsx.org/api/vscode/git/1.52.1/file/vscode.git-1.52.1.vsix", - "vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.39.2/file/vscode.markdown-language-features-1.39.2.vsix", - "vscode-builtin-extensions-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.50.1/file/eclipse-theia.builtin-extension-pack-1.50.1.vsix", - "redhat.java": "https://open-vsx.org/api/redhat/java/0.73.0/file/redhat.java-0.73.0.vsix", - "vscjava.vscode-java-debug": "https://open-vsx.org/api/vscjava/vscode-java-debug/0.30.0/file/vscjava.vscode-java-debug-0.30.0.vsix", - "vscjava.vscode-java-test": "https://open-vsx.org/api/vscjava/vscode-java-test/0.26.1/file/vscjava.vscode-java-test-0.26.1.vsix", - "vscjava.vscode-maven": "https://open-vsx.org/api/vscjava/vscode-maven/0.21.2/file/vscjava.vscode-maven-0.21.2.vsix", - "vscjava.vscode-java-dependency": "https://open-vsx.org/api/vscjava/vscode-java-dependency/0.16.0/file/vscjava.vscode-java-dependency-0.16.0.vsix", - "redhat.vscode-xml": "https://open-vsx.org/api/redhat/vscode-xml/0.20.0/file/redhat.vscode-xml-0.20.0.vsix", - "cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.92/file/eclipse-cdt.cdt-gdb-vscode-0.0.92.vsix", - "vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.62.3/file/vscode.cpp-1.62.3.vsix", - "vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.15/file/llvm-vs-code-extensions.vscode-clangd-0.1.15.vsix", - "vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.9.2/file/ms-vscode.cmake-tools-1.9.2.vsix" + "eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.88.1/file/eclipse-theia.builtin-extension-pack-1.88.1.vsix", + "vscjava.vscode-java-pack": "https://open-vsx.org/api/vscjava/vscode-java-pack/0.25.11/file/vscjava.vscode-java-pack-0.25.11.vsix", + "vscjava.vscode-java-dependency": "https://open-vsx.org/api/vscjava/vscode-java-dependency/0.21.2/file/vscjava.vscode-java-dependency-0.21.2.vsix" }, "theiaPluginsExcludeIds": [ + "ms-vscode.js-debug-companion", + "VisualStudioExptTeam.vscodeintellicode", "vscode.extension-editing", - "vscode.microsoft-authentication", - "vscode.html-language-features" + "vscode.github", + "vscode.github-authentication", + "vscode.microsoft-authentication" ] }