diff --git a/assembly-platform-api/pom.xml b/assembly-platform-api/pom.xml index f87ffd4a37e..ee05362da22 100644 --- a/assembly-platform-api/pom.xml +++ b/assembly-platform-api/pom.xml @@ -82,6 +82,11 @@ che-core-vfs-impl ${che.core.version} + + org.eclipse.che.plugin + che-plugin-docker-runner + ${che.plugins.version} + org.eclipse.che.plugin che-plugin-git-ext-git 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 index ba7848bd87a..7990248fdea 100644 --- 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/assembly-platform-api/src/main/webapp/WEB-INF/classes/codenvy/codenvy-api-configuration.properties b/assembly-platform-api/src/main/webapp/WEB-INF/classes/codenvy/codenvy-api-configuration.properties index c085c049824..f9265d0a4d9 100644 --- a/assembly-platform-api/src/main/webapp/WEB-INF/classes/codenvy/codenvy-api-configuration.properties +++ b/assembly-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