You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/06/26 13:28:00 UTC
[1/2] incubator-ignite git commit: # IGNITE-843 Create correct docker
file.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 2bbaa6821 -> 13173e908
# IGNITE-843 Create correct docker file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13173e90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13173e90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13173e90
Branch: refs/heads/ignite-843
Commit: 13173e908bed81e6e72d13d6f391b9b7d94e2dcc
Parents: 84f294a
Author: sevdokimov <se...@jetbrains.com>
Authored: Fri Jun 26 14:25:05 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Fri Jun 26 14:25:49 2015 +0300
----------------------------------------------------------------------
.../public/javascripts/controllers/summary.js | 39 ++++++++++++++++++--
1 file changed, 36 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13173e90/modules/webconfig/nodejs/public/javascripts/controllers/summary.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/summary.js b/modules/webconfig/nodejs/public/javascripts/controllers/summary.js
index 9eb2e4d..77c69c3 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/summary.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/summary.js
@@ -59,9 +59,42 @@ configuratorModule.controller('clustersList', ['$scope', '$http', function ($sco
return '';
}
- return 'OS: ' + $scope.dockerArg.os + '\n' +
- 'IG ver: ' + $scope.dockerArg.igniteVersion + '\n\n' +
- 'cfg: ' + $scope.currCluster._id
+ return "" +
+ "# Start from a Debian image.\n"+
+ "FROM " + $scope.dockerArg.os + "\n"+
+ "\n"+
+ "# Install tools.\n"+
+ "RUN apt-get update && apt-get install -y --fix-missing \\\n"+
+ " wget \\\n"+
+ " dstat \\\n"+
+ " maven \\\n"+
+ " git\n"+
+ "\n"+
+ "# Intasll Oracle JDK.\n"+
+ "RUN mkdir /opt/jdk\n"+
+ "\n"+
+ "RUN wget --header \"Cookie: oraclelicense=accept-securebackup-cookie\" \\\n"+
+ " http://download.oracle.com/otn-pub/java/jdk/7u76-b13/jdk-7u76-linux-x64.tar.gz\n"+
+ "\n"+
+ "RUN tar -zxf jdk-7u76-linux-x64.tar.gz -C /opt/jdk\n"+
+ "\n"+
+ "RUN rm jdk-7u76-linux-x64.tar.gz\n"+
+ "\n"+
+ "RUN update-alternatives --install /usr/bin/java java /opt/jdk/jdk1.7.0_76/bin/java 100\n"+
+ "\n"+
+ "RUN update-alternatives --install /usr/bin/javac javac /opt/jdk/jdk1.7.0_76/bin/javac 100\n"+
+ "\n"+
+ "# Sets java variables.\n"+
+ "ENV JAVA_HOME /opt/jdk/jdk1.7.0_76/\n"+
+ "\n"+
+ "# Create working directory\n"+
+ "WORKDIR /home\n"+
+ "\n"+
+ "RUN wget -O ignite.zip http://tiny.cc/updater/download_ignite.php ; unzip ignite.zip ; rm ignite.zip\n"+
+ "\n"+
+ "COPY ignite-configuration.xml /tmp/ignite-configuration.xml\n"+
+ "\n"+
+ "RUN mv /tmp/ignite-configuration.xml /home/$(ls)/config";
};
$scope.setSelectedCluster = function(cluster) {
[2/2] incubator-ignite git commit: # IGNITE-843 Use text bot to
select OS
Posted by se...@apache.org.
# IGNITE-843 Use text bot to select OS
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/84f294ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/84f294ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/84f294ae
Branch: refs/heads/ignite-843
Commit: 84f294aec015360a4da3839c9672d87715f8de83
Parents: 2bbaa68
Author: sevdokimov <se...@jetbrains.com>
Authored: Fri Jun 26 09:44:30 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Fri Jun 26 14:25:49 2015 +0300
----------------------------------------------------------------------
modules/webconfig/nodejs/views/layout.jade | 3 ++-
modules/webconfig/nodejs/views/summary.jade | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/84f294ae/modules/webconfig/nodejs/views/layout.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/layout.jade b/modules/webconfig/nodejs/views/layout.jade
index e7006bf..4bf5ad1 100644
--- a/modules/webconfig/nodejs/views/layout.jade
+++ b/modules/webconfig/nodejs/views/layout.jade
@@ -58,4 +58,5 @@ html(ng-app='ignite-web-configurator')
include includes/footer
- block body-script
\ No newline at end of file
+ block body-script
+ script(src='//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/js/bootstrap.min.js')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/84f294ae/modules/webconfig/nodejs/views/summary.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/summary.jade b/modules/webconfig/nodejs/views/summary.jade
index d646fc7..c1beb06 100644
--- a/modules/webconfig/nodejs/views/summary.jade
+++ b/modules/webconfig/nodejs/views/summary.jade
@@ -61,9 +61,8 @@ block content
.form-group
label.control-label.col-sm-3(for='os') Operation System
.col-sm-6
- select#os.form-control(ng-model='dockerArg.os')
- option(value='debian:8') debian:8
- option(value='ubuntu:12.04') ubuntu:12.04
+ input#os.form-control(type='text', ng-model='dockerArg.os', data-provide="typeahead",
+ placeholder='Enter OS version', data-source='["debian:8", "ubuntu:12.04"]')
.form-group
label.control-label.col-sm-3(for='igniteVersion') Ignite version