From 0a815e4934efdf24db80cb62ee3529e762e06501 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Mon, 6 Apr 2015 18:26:59 -0700 Subject: [PATCH] Add container entrypoint --- app/containers/new/controller.js | 14 ++++++++++++++ app/templates/container/new-command.hbs | 10 +++++++++- package.json | 6 ++++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/containers/new/controller.js b/app/containers/new/controller.js index 86eb375c1..5801962a9 100644 --- a/app/containers/new/controller.js +++ b/app/containers/new/controller.js @@ -1,5 +1,6 @@ import Ember from 'ember'; import NewOrEditContainer from 'ui/container/edit/new-or-edit'; +import ShellQuote from 'npm:shell-quote'; export default Ember.ObjectController.extend(NewOrEditContainer, { queryParams: ['tab','hostId','advanced'], @@ -501,4 +502,17 @@ export default Ember.ObjectController.extend(NewOrEditContainer, { out.endPropertyChanges(); }.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'), + }); diff --git a/app/templates/container/new-command.hbs b/app/templates/container/new-command.hbs index 61bbfde8b..a1186225d 100644 --- a/app/templates/container/new-command.hbs +++ b/app/templates/container/new-command.hbs @@ -3,9 +3,17 @@ -
+
{{input class="form-control" type="text" id="command" value=command placeholder="e.g. /usr/sbin/httpd"}}
+
+
+
+ +
+
+ {{input class="form-control" type="text" id="strEntryPoint" value=strEntryPoint placeholder="e.g. /bin/sh -c"}} +
diff --git a/package.json b/package.json index e6be0e240..9757fb5b6 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,10 @@ "broccoli-sass": "0.6.2", "connect-restreamer": "^1.0.1", "ember-api-store": "1.0.14", + "ember-browserify": "^0.6.4", "ember-cli": "0.2.0", - "ember-cli-babel": "^4.0.0", "ember-cli-app-version": "0.3.3", + "ember-cli-babel": "^4.0.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "0.0.8", "ember-cli-font-awesome": "0.0.9", @@ -41,6 +42,7 @@ "forever-agent": "^0.5.2", "glob": "^5.0.3", "http-proxy": "^1.6.2", - "rancher-torii": "0.2.6" + "rancher-torii": "0.2.6", + "shell-quote": "^1.4.3" } }