Clean up theia-endpoint-runtime directory structure

che-theia-init-sources.yml

@@ -1,7 +1,7 @@
 sources:
 - source: https://github.com/eclipse/che-theia
   extensions:
-    - dockerfiles/theia-endpoint-runtime
+    - extensions/eclipse-che-theia-plugin-remote
     - extensions/eclipse-che-theia-plugin
     - extensions/eclipse-che-theia-plugin-ext
     - extensions/eclipse-che-theia-terminal

dockerfiles/theia-endpoint-runtime/.gitignore

@@ -1,8 +1,6 @@
 theia-plugin-ext
 docker-build
-node_modules
 .browser_modules
-lib
 *.log
 *-app/*
 !*-app/package.json

dockerfiles/theia-endpoint-runtime/Dockerfile

@@ -36,16 +36,16 @@ ADD https://${GITHUB_TOKEN}:x-oauth-basic@api.github.com/repos/theia-ide/theia/g
 ADD https://${GITHUB_TOKEN}:x-oauth-basic@api.github.com/repos/eclipse/che-theia/git/refs/head /tmp/branch_info.json
 
 # Grab dependencies
-COPY /package.json /home/workspace/packages/theia-remote/
+COPY /docker-build/theia-plugin-remote/package.json /home/workspace/packages/theia-remote/
 RUN cd /home/workspace/packages/theia-remote/ && yarn install --ignore-scripts
 
 # Compile
 COPY /docker-build/configs /home/workspace/configs
-COPY *.json /home/workspace/packages/theia-remote/
-COPY /src /home/workspace/packages/theia-remote/src
+COPY /docker-build/theia-plugin-remote/*.json /home/workspace/packages/theia-remote/
+COPY /docker-build/theia-plugin-remote/src /home/workspace/packages/theia-remote/src
 COPY /docker-build/theia-plugin-ext /home/workspace/packages/theia-plugin-ext
 COPY /docker-build/theia-plugin /home/workspace/packages/theia-plugin
-COPY /tsconfig.json /home/workspace/packages/theia-plugin/tsconfig.json
+COPY /docker-build/theia-plugin-remote/tsconfig.json /home/workspace/packages/theia-plugin/tsconfig.json
 
 COPY /etc/package.json /home/workspace
 RUN cd /home/workspace/ && yarn install

dockerfiles/theia-endpoint-runtime/build.sh

@@ -35,6 +35,12 @@ cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-ext/webpack.config.
 echo "Copying ${base_dir}/../../configs --> ${LOCAL_ASSEMBLY_DIR}/configs"
 cp -r "${base_dir}/../../configs/." "${LOCAL_ASSEMBLY_DIR}/configs"
 
+echo "Copying ${base_dir}/../../extensions/eclipse-che-theia-plugin-remote --> ${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote"
+mkdir ${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote
+cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-remote/src/." "${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote/src/"
+cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-remote/package.json" "${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote"
+cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-remote/tsconfig.json" "${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote"
+
 
 init --name:theia-endpoint-runtime "$@"
 build