diff --git a/assembly-sdk-war/pom.xml b/assembly-sdk-war/pom.xml index e5985fe163d..fe63eb080ac 100644 --- a/assembly-sdk-war/pom.xml +++ b/assembly-sdk-war/pom.xml @@ -166,6 +166,11 @@ che-plugin-codemirror-editorwidget ${che.plugins.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-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 index a42f5ed3bfc..a50665a4764 100644 --- 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 @@ -117,6 +117,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-sdk-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties b/assembly-sdk-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties index 2d32a72ccf9..8351732e7a5 100644 --- 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 @@ -130,9 +134,7 @@ 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} \ No newline at end of file +che.java.codeassistant.index.dir=${java.io.tmpdir}