Fix start container form model

pull/2/head
Michael Crosby 12 years ago
parent fde898aa1f
commit a2a8c4863f

@ -255,17 +255,21 @@ function ImageController($scope, $routeParams, $location, Image) {
function StartContainerController($scope, $routeParams, $location, Container) { function StartContainerController($scope, $routeParams, $location, Container) {
$scope.template = 'partials/startcontainer.html'; $scope.template = 'partials/startcontainer.html';
$scope.memory = 0; $scope.config = {
$scope.memorySwap = 0; memory: 0,
$scope.env = ''; memorySwap: 0,
$scope.dns = ''; env: '',
$scope.volumesFrom = ''; commands: '',
$scope.commands = ''; volumesFrom: ''
};
$scope.commandPlaceholder = '["/bin/echo", "Hello world"]';
$scope.launchContainer = function() { $scope.launchContainer = function() {
$scope.response = '';
var cmds = null; var cmds = null;
if ($scope.commands !== '') { if ($scope.config.commands !== '') {
cmds = $scope.commands.split('\n'); cmds = angular.fromJson($scope.config.commands);
} }
var id = $routeParams.id; var id = $routeParams.id;
var ctor = Container; var ctor = Container;
@ -274,10 +278,10 @@ function StartContainerController($scope, $routeParams, $location, Container) {
Container.create({ Container.create({
Image: id, Image: id,
Memory: $scope.memory, Memory: $scope.config.memory,
MemorySwap: $scope.memorySwap, MemorySwap: $scope.config.memorySwap,
Cmd: cmds, Cmd: cmds,
VolumesFrom: $scope.volumesFrom VolumesFrom: $scope.config.volumesFrom
}, function(d) { }, function(d) {
console.log(d); console.log(d);
if (d.Id) { if (d.Id) {

@ -68,7 +68,7 @@
<fieldset> <fieldset>
<legend>Tag image</legend> <legend>Tag image</legend>
<label>Tag:</label> <label>Tag:</label>
<input type="text" placeholder="repo..." ng-model="tag.repo" required> <input type="text" placeholder="repo..." ng-model="tag.repo">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" ng-model="tag.force"/> Force? <input type="checkbox" ng-model="tag.force"/> Force?
</label> </label>

@ -9,17 +9,16 @@
<legend>Start container from Image</legend> <legend>Start container from Image</legend>
<label>Cmd:</label> <label>Cmd:</label>
<textarea ng-model="commands" rows="6"></textarea> <input type="text" placeholder="{{ commandPlaceholder }}" ng-model="config.commands"/>
<small>Place each command on a new line</small> <small>Input commands as an array</small>
<label>Memory:</label> <label>Memory:</label>
<input type="number" ng-model="memory"/> <input type="number" ng-model="config.memory"/>
<label>Memory Swap:</label> <label>Memory Swap:</label>
<input type="number" ng-model="memorySwap"/> <input type="number" ng-model="config.memorySwap"/>
<label>Volumes From:</label> <label>Volumes From:</label>
<input type="text" ng-model="volumesFrom"/> <input type="text" ng-model="config.volumesFrom"/>
<br /> <br />
<input type="button" ng-click="launchContainer()" value="Launch" /> <input type="button" ng-click="launchContainer()" value="Launch" />

Loading…
Cancel
Save