# IGNITE-843 Add comment for docker file, remove 'ignite-version' field.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3b48363b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b48363b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b48363b Branch: refs/heads/ignite-843 Commit: 3b48363bde46004574b8c460d0f935a219a19914 Parents: f1a791b Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Sun Jun 28 19:48:20 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Sun Jun 28 19:48:20 2015 +0300 ---------------------------------------------------------------------- .../nodejs/public/javascripts/controllers/summary.js | 9 ++++----- modules/webconfig/nodejs/views/summary.jade | 14 ++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b48363b/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 0125d76..25cd795 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/summary.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/summary.js @@ -50,8 +50,7 @@ configuratorModule.controller('clustersList', ['$scope', '$http', function ($sco }; $scope.dockerArg = { - os: 'debian:8', - igniteVersion: '1.1.0' + os: 'debian:8' }; $scope.dockerFile = function() { @@ -90,11 +89,11 @@ configuratorModule.controller('clustersList', ['$scope', '$http', function ($sco "# 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"+ + "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"+ + "COPY *.xml /tmp/\n"+ "\n"+ - "RUN mv /tmp/ignite-configuration.xml /home/$(ls)/config"; + "RUN mv /tmp/*.xml /home/$(ls)/config"; }; $scope.setSelectedCluster = function(cluster) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b48363b/modules/webconfig/nodejs/views/summary.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/summary.jade b/modules/webconfig/nodejs/views/summary.jade index c1beb06..5b9c53d 100644 --- a/modules/webconfig/nodejs/views/summary.jade +++ b/modules/webconfig/nodejs/views/summary.jade @@ -45,7 +45,7 @@ block content li(ng-class="{active: cfgLang=='java'}") a(href, ng-click='setCfgLang("java")') Java li(ng-class="{active: cfgLang=='docker'}") - a(href, ng-click='setCfgLang("docker")') Docker + a(href, ng-click='setCfgLang("docker")') Dockerfile div(style='padding-top: 10px') #xmlResult(ng-show="cfgLang == 'xml'") @@ -57,6 +57,11 @@ block content | {{resultJava}} #dockerResult(ng-show="cfgLang == 'docker'") + p + a(href='https://docs.docker.com/reference/builder') Dockerfile + | is a text file with instructions to create Docker image. To build image you have to + | store following Docker file with your xml ignite configurations to the same directory. + form.form-horizontal .form-group label.control-label.col-sm-3(for='os') Operation System @@ -65,13 +70,6 @@ block content placeholder='Enter OS version', data-source='["debian:8", "ubuntu:12.04"]') .form-group - label.control-label.col-sm-3(for='igniteVersion') Ignite version - .col-sm-6 - select#igniteVersion.form-control(ng-model='dockerArg.igniteVersion') - option(value='1.1.0') 1.1.0 - option(value='1.0.0') 1.0.0 - - .form-group textarea.form-control(rows=30, readonly=true) | {{ dockerFile() }}
