Merge pull request #21 from codenvy/IDEX-2892

IDEX-2892 Include Docker plugin in the SDK
eclipse-che · Aug 20, 2015 · db44132 · db44132
2 parents bf81125 + 02d2f17
commit db44132
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/assembly-sdk-war/pom.xml b/assembly-sdk-war/pom.xml
@@ -168,6 +168,21 @@
             <artifactId>che-plugin-codemirror-editorwidget</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-docker-client</artifactId>
+            <version>${che.plugins.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-docker-ext-client</artifactId>
+            <version>${che.plugins.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-docker-runner</artifactId>
+            <version>${che.plugins.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-git-ext-git</artifactId>

diff --git a/assembly-sdk-war/src/main/java/org/eclipse/che/api/deploy/ApiModule.java b/assembly-sdk-war/src/main/java/org/eclipse/che/api/deploy/ApiModule.java
@@ -55,6 +55,7 @@
 import org.eclipse.che.jdt.JavaNavigationService;
 import org.eclipse.che.jdt.JavadocService;
 import org.eclipse.che.jdt.RestNameEnvironment;
+import org.eclipse.che.plugin.docker.runner.DockerRunnerModule;
 import org.eclipse.che.security.oauth.OAuthAuthenticationService;
 import org.eclipse.che.security.oauth.OAuthAuthenticatorProvider;
 import org.eclipse.che.security.oauth.OAuthAuthenticatorProviderImpl;
@@ -124,6 +125,7 @@ protected void configure() {
         install(new AnalyticsModule());
         install(new BaseProjectModule());
         install(new BuilderModule());
+        install(new DockerRunnerModule());
         install(new RunnerModule());
         install(new VirtualFileSystemModule());
         install(new VirtualFileSystemFSModule());

diff --git a/assembly-sdk-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml b/assembly-sdk-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml
@@ -54,6 +54,9 @@
 
     <inherits name='org.eclipse.che.env.local.LocalEnvironment'/>
 
+    <!-- Docker -->
+    <inherits name='org.eclipse.che.plugin.docker.ext.client.Docker'/>
+
     <!-- Platform API GWT client dependencies                       -->
     <inherits name='org.eclipse.che.api.Analytics'/>
     <inherits name='org.eclipse.che.api.Builder'/>

diff --git a/assembly-sdk-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties b/assembly-sdk-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties
@@ -61,6 +61,10 @@ runner.javascript_grunt.host_name=localhost
 runner.javascript_gulp.host_name=localhost
 # docker
 runner.docker.host_name=localhost
+runner.docker.application_link_template=http://localhost:%d
+runner.docker.web_shell_link_template=http://localhost:%d
+runner.docker.watch_update_project_types=AngularJS,php,ruby,python,GAEPython,GAEPhp,GruntJS,GulpJS,BasicJS,cpp,blank
+runner.docker.dockerfiles_repo=${catalina.base}/temp/dockerfiles-repo
 # extensions
 extension-url=${catalina.base}/tutorials
 tutorials-url=${catalina.base}/tutorials
@@ -133,11 +137,8 @@ builder.slave_builder_urls=http://localhost:${SERVER_PORT}/che/api/internal/buil
 
 #change enabling of subscription orgaddon
 subscription.orgaddon.enabled=true
-#path to docker files repos
-runner.docker.dockerfiles_repo=/faik-path
 #initial thread pool size for scheduled tasks
 schedule.core_pool_size=10
 
 che.java.codeassistant.index.dir=${java.io.tmpdir}
-
-git.server.uri.prefix=git
+git.server.uri.prefix=git