Merge remote-tracking branch 'origin' into vscode-diff

dockerfiles/theia-dev/docker/alpine/install-dependencies.dockerfile

@@ -6,7 +6,7 @@ RUN apk add --update --no-cache \
     # compile some javascript native stuff (node-gyp)
     make gcc g++ python \
     # clone repositories (and also using ssh repositories)
-    git openssh openssh-keygen \
+    git openssh openssh-keygen man git-doc \
     # Handle git diff properly
     less \
     # bash shell

dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile

@@ -1,3 +1,3 @@
 USER root
-RUN yum install -y curl make cmake gcc gcc-c++ python2 git openssh less bash tar gzip \
+RUN yum install -y curl make cmake gcc gcc-c++ python2 git git-core-doc openssh less bash tar gzip \
     && yum -y clean all && rm -rf /var/cache/yum

dockerfiles/theia/Dockerfile

@@ -163,5 +163,6 @@ COPY --from=builder /home/theia-dev/theia-source-code/production/plugins /defaul
 COPY --chown=theia:root --from=builder /home/theia-dev/theia-source-code/production /home/theia
 USER theia
 WORKDIR /projects
+COPY src/get-webview-route.js ${HOME}/get-webview-route.js
 COPY src/entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

dockerfiles/theia/src/entrypoint.sh

@@ -76,7 +76,8 @@ if [ "${NOCDN}" == "true" ]; then
 fi
 shopt -u nocasematch
 
-# run che
+# run Che Theia
+export THEIA_WEBVIEW_EXTERNAL_ENDPOINT=$(node get-webview-route.js)
 node src-gen/backend/main.js /projects --hostname=0.0.0.0 --port=${THEIA_PORT} &
 
 PID=$!

dockerfiles/theia/src/get-webview-route.js

@@ -0,0 +1,73 @@
+/*********************************************************************
+ * Copyright (c) 2019 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+
+const fs = require('fs');
+const workspaceClient = require('@eclipse-che/workspace-client');
+
+// Assume that self-signed certificate is located by the following path
+const SS_CRT_PATH = '/tmp/che/secret/ca.crt';
+
+// Configure workspace API client
+const restAPIConfig = {
+    baseUrl: process.env.CHE_API
+};
+
+const token = process.env.CHE_MACHINE_TOKEN;
+if (token) {
+    restAPIConfig.headers = {};
+    restAPIConfig.headers['Authorization'] = 'Bearer ' + token;
+}
+
+if (fs.existsSync(SS_CRT_PATH)) {
+    restAPIConfig.ssCrtPath = SS_CRT_PATH;
+}
+
+// Create rest API workspace client
+const restApiClient = workspaceClient.default.getRestApi(restAPIConfig);
+
+// Search for IDE route
+function getIdeRoute() {
+    return new Promise((resolve, reject) => {
+        restApiClient.getById(process.env.CHE_WORKSPACE_ID).then(workspace => {
+            const containers = workspace.runtime.machines;
+            Object.keys(containers).forEach(containerName => {
+                const container = containers[containerName];
+                const servers = container['servers'];
+                if (servers) {
+                    const ideServerName = Object.keys(servers).find(serverName => servers[serverName].attributes && servers[serverName].attributes['type'] === 'ide');
+                    if (ideServerName) {
+                        resolve(servers[ideServerName].url);
+                    }
+                }
+            });
+            reject('Server with type "ide" not found.');
+        }).catch(error => {
+            reject(error);
+        });
+    });
+}
+
+getIdeRoute().then(ideRoute => {
+    if (!ideRoute) {
+        throw new Error('Failed to get ide route.');
+    }
+
+    // Remove trailing slash if any
+    if (ideRoute.endsWith('/')) {
+        ideRoute = ideRoute.substring(0, ideRoute.length - 1);
+    }
+    // Remove protocol
+    const webviewDomain = ideRoute.replace(/^https?:\/\//, '');
+    // Return result to shell by writing into stdout
+    process.stdout.write(webviewDomain);
+}).catch(error => {
+    console.error('Unable to get IDE route. Webviews might not work. Cause:', error);
+    // Just exit this script without returning a value to the shell.
+});

extensions/eclipse-che-theia-plugin-remote/devfile.yaml

@@ -10,8 +10,6 @@ components:
   - type: cheEditor
     id: eclipse/che-theia/next
     alias: theia-editor
-  - type: chePlugin
-    id: eclipse/che-machine-exec-plugin/next
   - type: chePlugin
     id: che-incubator/typescript/latest
     memoryLimit: 2Gi

generator/src/templates/assembly-package.mst

@@ -6,7 +6,8 @@
     "frontend": {
       "config": {
         "preferences": {
-          "editor.autoSave": "on"
+          "editor.autoSave": "on",
+          "git.defaultCloneDirectory": "/projects"
         }
       }
     }