rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #113 from vincent99/entrypoint 

Add container entrypoint
This commit is contained in:
Vincent Fiduccia 2015-04-06 19:02:02 -07:00
parent cf52da192f 0a815e4934
commit 833ad4e05f
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/containers/new/controller.js
View File

@ -1,5 +1,6 @@
import Ember from 'ember'; import Ember from 'ember';
import NewOrEditContainer from 'ui/container/edit/new-or-edit'; import NewOrEditContainer from 'ui/container/edit/new-or-edit';
import ShellQuote from 'npm:shell-quote';
export default Ember.ObjectController.extend(NewOrEditContainer, { export default Ember.ObjectController.extend(NewOrEditContainer, {
queryParams: ['tab','hostId','advanced'], queryParams: ['tab','hostId','advanced'],
@ -501,4 +502,17 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
out.endPropertyChanges(); out.endPropertyChanges();
}.observes('devicesArray.@each.{host,container,permissions}'), }.observes('devicesArray.@each.{host,container,permissions}'),
strEntryPoint: '',
strEntryPointDidChange: function() {
var out = ShellQuote.parse(this.get('strEntryPoint').trim()||'');
if ( out.length )
{
this.set('entryPoint', out);
}
else
{
this.set('entryPoint', null);
}
}.observes('strEntryPoint'),
}); });

10
app/templates/container/new-command.hbs
View File

@ -3,9 +3,17 @@
<label for="command" class="form-control-static">Command</label> <label for="command" class="form-control-static">Command</label>
</div> </div>
<div class="col-sm-12 col-md-4"> <div class="col-sm-12 col-md-8">
{{input class="form-control" type="text" id="command" value=command placeholder="e.g. /usr/sbin/httpd"}} {{input class="form-control" type="text" id="command" value=command placeholder="e.g. /usr/sbin/httpd"}}
</div> </div>
</div>
<div class="row form-group">
<div class="col-sm-12 col-md-2 form-label">
<label for="strEntryPoint" class="form-control-static">Entry Point</label>
</div>
<div class="col-sm-12 col-md-4">
{{input class="form-control" type="text" id="strEntryPoint" value=strEntryPoint placeholder="e.g. /bin/sh -c"}}
</div>
<div class="col-sm-12 col-md-1 form-label" style="text-align: left"> <div class="col-sm-12 col-md-1 form-label" style="text-align: left">
<label for="user" class="form-control-static">user</label> <label for="user" class="form-control-static">user</label>
</div> </div>

6
package.json
View File

@ -25,9 +25,10 @@
"broccoli-sass": "0.6.2", "broccoli-sass": "0.6.2",
"connect-restreamer": "^1.0.1", "connect-restreamer": "^1.0.1",
"ember-api-store": "1.0.14", "ember-api-store": "1.0.14",
"ember-browserify": "^0.6.4",
"ember-cli": "0.2.0", "ember-cli": "0.2.0",
"ember-cli-babel": "^4.0.0",
"ember-cli-app-version": "0.3.3", "ember-cli-app-version": "0.3.3",
"ember-cli-babel": "^4.0.0",
"ember-cli-content-security-policy": "0.4.0", "ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "0.0.8", "ember-cli-dependency-checker": "0.0.8",
"ember-cli-font-awesome": "0.0.9", "ember-cli-font-awesome": "0.0.9",
@ -41,6 +42,7 @@
"forever-agent": "^0.5.2", "forever-agent": "^0.5.2",
"glob": "^5.0.3", "glob": "^5.0.3",
"http-proxy": "^1.6.2", "http-proxy": "^1.6.2",
"rancher-torii": "0.2.6" "rancher-torii": "0.2.6",
"shell-quote": "^1.4.3"
} }
} }