Include docker runner in Che

eclipse-che · May 6, 2015 · 3ec74fc · 3ec74fc
1 parent 18fc134
commit 3ec74fc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/assembly-platform-api/pom.xml b/assembly-platform-api/pom.xml
@@ -82,6 +82,11 @@
             <artifactId>che-core-vfs-impl</artifactId>
             <version>${che.core.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-platform-api/src/main/java/org/eclipse/che/api/deploy/ApiModule.java b/assembly-platform-api/src/main/java/org/eclipse/che/api/deploy/ApiModule.java
@@ -115,6 +115,7 @@ protected void configure() {
         install(new AnalyticsModule());
         install(new BaseProjectModule());
         install(new BuilderModule());
+        install(new org.eclipse.che.runner.docker.DockerRunnerModule());
         install(new RunnerModule());
         install(new VirtualFileSystemModule());
         install(new VirtualFileSystemFSModule());

diff --git a/...platform-api/src/main/webapp/WEB-INF/classes/codenvy/codenvy-api-configuration.properties b/...platform-api/src/main/webapp/WEB-INF/classes/codenvy/codenvy-api-configuration.properties
@@ -47,6 +47,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
@@ -98,4 +102,3 @@ builder.slave_builder_urls=http://localhost:${SERVER_PORT}/api/internal/builder
 notification.server.propagate_events=vfs
 
 subscription.orgaddon.enabled=true
-runner.docker.dockerfiles_repo=/faik-path