From 8189276d9e2ab17f1bb3647b60f2e0f38c2d2b03 Mon Sep 17 00:00:00 2001 From: Oleksandr Andriienko Date: Mon, 17 Sep 2018 16:28:21 +0300 Subject: [PATCH] Add 'che-theia-terminal-extension' and 'che-theia-task-plugin' to the Theia image (#11228) * Add 'che-theia-terminal-extension', 'che-theia-task-plugin', che-exec-machine to the theia image. Signed-off-by: Oleksandr Andriienko * Use che-machine-exec image from wsskeleton. Signed-off-by: Oleksandr Andriienko --- dockerfiles/theia/src/extensions.json | 14 ++++++++ dockerfiles/theia/src/package.json | 1 - .../src/main/resources/stacks.json | 33 ++++++++++++++++--- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dockerfiles/theia/src/extensions.json b/dockerfiles/theia/src/extensions.json index 83699c5081..00e525f0d0 100644 --- a/dockerfiles/theia/src/extensions.json +++ b/dockerfiles/theia/src/extensions.json @@ -47,6 +47,20 @@ "folder": "che-theia-java-extension", "checkoutTo": "master", "type": "git" + }, + { + "name": "che-theia-terminal", + "source": "https://github.com/eclipse/che-theia-terminal-extension.git", + "folder": "che-theia-terminal", + "checkoutTo": "ee583bf4e7956502a2d9a4fab55b06bcbe7b0117", + "type": "git" + }, + { + "name": "@eclipse-che/theia-task-extension", + "source": "https://github.com/eclipse/che-theia-task-plugin.git", + "folder": "che-theia-task-extension", + "checkoutTo": "47450ee167a7d8429550c45be48f93230bf44ebd", + "type": "git" } ] } diff --git a/dockerfiles/theia/src/package.json b/dockerfiles/theia/src/package.json index c130e45016..8069353e20 100644 --- a/dockerfiles/theia/src/package.json +++ b/dockerfiles/theia/src/package.json @@ -5,7 +5,6 @@ "@theia/typescript": "latest", "@theia/editor": "latest", "@theia/navigator": "latest", - "@theia/terminal": "latest", "@theia/outline-view": "latest", "@theia/preferences": "latest", "@theia/git": "latest", diff --git a/ide/che-core-ide-stacks/src/main/resources/stacks.json b/ide/che-core-ide-stacks/src/main/resources/stacks.json index d9f6afe2c5..960396da1b 100644 --- a/ide/che-core-ide-stacks/src/main/resources/stacks.json +++ b/ide/che-core-ide-stacks/src/main/resources/stacks.json @@ -7,7 +7,6 @@ "scope": "general", "tags": [ "Theia", - "Alpine", "CentOS" ], "workspaceConfig": { @@ -45,12 +44,24 @@ "attributes": { "memoryLimitBytes": "2147483648" } + }, + "machine-exec": { + "servers": { + "machine-exec": { + "attributes": { + "type": "terminal" + }, + "protocol": "ws", + "port": "4444" + } + }, + "installers": [] } }, "recipe": { - "contentType": "", - "type": "dockerimage", - "content": "eclipse/che-theia:0.3.14-nightly" + "contentType": "application/x-yaml", + "type": "compose", + "content": "services:\n machine-exec:\n image: 'wsskeleton/che-machine-exec:latest'\n mem_limit: 536870912\n theia:\n image: 'eclipse/che-theia:0.3.14-nightly'\n mem_limit: 1073741824\n depends_on:\n - machine-exec\n" } } }, @@ -119,11 +130,23 @@ }, "installers": [], "env": {} + }, + "ws/machine-exec": { + "servers": { + "machine-exec": { + "attributes": { + "type": "terminal" + }, + "protocol": "ws", + "port": "4444" + } + }, + "installers": [] } }, "recipe": { "type": "openshift", - "content": "---\nkind: List\nitems:\n-\n apiVersion: v1\n kind: Pod\n metadata:\n name: ws\n spec:\n containers:\n -\n image: eclipse/che-theia:0.3.14-nightly\n name: theia\n -\n image: eclipse/che-dev:nightly\n name: dev", + "content": "---\nkind: List\nitems:\n-\n apiVersion: v1\n kind: Pod\n metadata:\n name: ws\n spec:\n containers:\n -\n image: eclipse/che-theia:0.3.14-nightly\n name: theia\n -\n image: eclipse/che-dev:nightly\n name: dev\n -\n image: wsskeleton/che-machine-exec:latest\n name: machine-exec", "contentType": "application/x-yaml" } }