Merge pull request #37 from nazar-pc/master

Added possibility to specify name at container creation

js/controllers.js

@@ -214,13 +214,13 @@ function ContainerController($scope, $routeParams, $location, Container, Message
 // Controller for the list of containers
 function ContainersController($scope, Container, Settings, Messages, ViewSpinner) {
     $scope.predicate = '-Created';
-    $scope.toggle = false;
+    $scope.toggle = false;
     $scope.displayAll = Settings.displayAll;
 
     var update = function(data) {
         ViewSpinner.spin();
         Container.query(data, function(d) {
-            $scope.containers = d.map(function(item) { 
+            $scope.containers = d.map(function(item) { 
             	return new ContainerViewModel(item); });
             ViewSpinner.stop();
         });
@@ -258,7 +258,7 @@ function ContainersController($scope, Container, Settings, Messages, ViewSpinner
     };
 
     $scope.toggleGetAll = function() {
-        Settings.displayAll = $scope.displayAll;
+        Settings.displayAll = $scope.displayAll;
         update({all: Settings.displayAll ? 1 : 0});
     };
 
@@ -395,6 +395,7 @@ function ImageController($scope, $q, $routeParams, $location, Image, Container,
 function StartContainerController($scope, $routeParams, $location, Container, Messages) {
     $scope.template = 'partials/startcontainer.html';
     $scope.config = {
+        name: '',
         memory: 0,
         memorySwap: 0,
         env: '',
@@ -415,6 +416,7 @@ function StartContainerController($scope, $routeParams, $location, Container, Me
 
         Container.create({
                 Image: id,
+                name: $scope.config.name,
                 Memory: $scope.config.memory,
                 MemorySwap: $scope.config.memorySwap,
                 Cmd: cmds,

js/services.js

@@ -4,7 +4,9 @@ angular.module('dockerui.services', ['ngResource'])
     .factory('Container', function($resource, Settings) {
         // Resource for interacting with the docker containers
         // http://docs.docker.io/en/latest/api/docker_remote_api.html#containers
-        return $resource(Settings.url + '/containers/:id/:action', {}, {
+        return $resource(Settings.url + '/containers/:id/:action', {
+        	name: '@name'
+        }, {
             query: {method: 'GET', params:{ all: 0, action: 'json'}, isArray: true},
             get :{method: 'GET', params: { action:'json'}},
             start: {method: 'POST', params: {id: '@id', action: 'start'}},

partials/startcontainer.html

@@ -11,6 +11,10 @@
             <label>Cmd:</label>
             <input type="text" placeholder="{{ commandPlaceholder }}" ng-model="config.commands"/>
             <small>Input commands as an array</small>
+
+            <label>Name:</label>
+            <input type="text" ng-model="config.name"/>
+
             <label>Memory:</label>
             <input type="number" ng-model="config.memory"/>