ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject incubator-ignite git commit: # IGNITE-843 Fix OS selection
Date Mon, 29 Jun 2015 10:06:45 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 c7132a9f6 -> 7915baa0c


# IGNITE-843 Fix OS selection


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7915baa0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7915baa0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7915baa0

Branch: refs/heads/ignite-843
Commit: 7915baa0c89901a34d69b09a2f41edd5355afd22
Parents: c7132a9
Author: sevdokimov <sergey.evdokimov@jetbrains.com>
Authored: Mon Jun 29 13:06:29 2015 +0300
Committer: sevdokimov <sergey.evdokimov@jetbrains.com>
Committed: Mon Jun 29 13:06:40 2015 +0300

----------------------------------------------------------------------
 .../nodejs/public/javascripts/controllers/summary.js     | 11 +++++++----
 modules/webconfig/nodejs/views/summary.jade              |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7915baa0/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 5f38051..35180ad 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/summary.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/summary.js
@@ -61,9 +61,7 @@ configuratorModule.controller('clustersList', ['$scope', '$http', function
($sco
     $scope.$watch('cfgLang', $scope.generateConfig);
     $scope.$watch('generateJavaClass', $scope.generateConfig);
 
-    $scope.dockerArg = {
-        os: 'debian:8'
-    };
+    $scope.dockerArg = {};
     
     $scope.downloadDocker = function() {
         var dockerText = $scope.dockerFile();
@@ -88,9 +86,14 @@ configuratorModule.controller('clustersList', ['$scope', '$http', function
($sco
             return '';
         }
         
+        var os = $scope.dockerArg.os;
+        if (!os) {
+            os = 'debian:8'
+        }
+        
         return "" +
             "# Start from a Debian image.\n"+
-            "FROM " + $scope.dockerArg.os + "\n"+
+            "FROM " + os + "\n"+
             "\n"+
             "# Install tools.\n"+
             "RUN apt-get update && apt-get install -y --fix-missing \\\n"+

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7915baa0/modules/webconfig/nodejs/views/summary.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/summary.jade b/modules/webconfig/nodejs/views/summary.jade
index b998fb9..99c0dfe 100644
--- a/modules/webconfig/nodejs/views/summary.jade
+++ b/modules/webconfig/nodejs/views/summary.jade
@@ -76,8 +76,7 @@ block content
                             .form-group
                                 label.control-label.col-sm-3(for='os') Operation System
                                 .col-sm-6
-                                    input#os.form-control(type='text', ng-model='dockerArg.os',
data-provide="typeahead",
-                                    placeholder='Enter OS version', data-source='["debian:8",
"ubuntu:12.04"]')
+                                    input#os.form-control(type='text', ng-model='dockerArg.os',
placeholder='debian:8')
                                 
                             .form-group
                                 | Download as 


Mime
View raw message