Merge branch 'release/1.10.1'

Release 1.10.0

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,43 @@
+<!--
+
+Thanks for opening an issue on Portainer !
+
+Do you need help or have a question? Come chat with us on gitter: https://gitter.im/portainer/Lobby.
+
+If you are reporting a new issue, make sure that we do not have any duplicates
+already open. You can ensure this by searching the issue list for this
+repository. If there is a duplicate, please close your issue and add a comment
+to the existing issue instead.
+
+Also, be sure to check our FAQ and documentation first: https://portainer.readthedocs.io
+
+If you suspect your issue is a bug, please edit your issue description to
+include the BUG REPORT INFORMATION shown below.
+
+---------------------------------------------------
+BUG REPORT INFORMATION
+---------------------------------------------------
+You do NOT have to include this information if this is a FEATURE REQUEST
+-->
+
+**Description**
+
+<!--
+Briefly describe the problem you are having in a few paragraphs.
+-->
+
+**Steps to reproduce the issue:**
+
+1.
+2.
+3.
+
+Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
+
+**Technical details:**
+
+* Portainer version:
+* Target Docker version (the host/cluster you manage):
+* Target Swarm version (if applicable):
+* Platform (windows/linux):
+* Browser:

.gitignore

@@ -1,10 +1,4 @@
-logs/*
-!.gitkeep
-*.esproj/*
 node_modules
 bower_components
-.idea
-*.iml
 dist
-dist/*
 portainer-checksum.txt

CONTRIBUTING.md

@@ -0,0 +1,57 @@
+# Contributing Guidelines
+
+Some basic conventions for contributing to this project.
+
+### General
+
+Please make sure that there aren't existing pull requests attempting to address the issue mentioned. Likewise, please check for issues related to update, as someone else may be working on the issue in a branch or fork.
+
+* Non-trivial changes should be discussed in an issue first
+* Develop in a topic branch, not master
+
+### Linting
+
+Please check your code using `grunt lint` before submitting your pull requests.
+
+### Commit Message Format
+
+Each commit message should include a **type**, a **scope** and a **subject**:
+
+```
+ <type>(<scope>): <subject>
+```
+
+Lines should not exceed 100 characters. This allows the message to be easier to read on github as well as in various git tools and produces a nice, neat commit log ie:
+
+```
+ #271 feat(containers): add exposed ports in the containers view
+ #270 fix(templates): fix a display issue in the templates view
+ #269 style(dashboard): update dashboard with new layout
+```
+
+#### Type
+
+Must be one of the following:
+
+* **feat**: A new feature
+* **fix**: A bug fix
+* **docs**: Documentation only changes
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
+  semi-colons, etc)
+* **refactor**: A code change that neither fixes a bug or adds a feature
+* **test**: Adding missing tests
+* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
+  generation
+
+#### Scope
+
+The scope could be anything specifying place of the commit change. For example `networks`,
+`containers`, `images` etc...
+
+#### Subject
+
+The subject contains succinct description of the change:
+
+* use the imperative, present tense: "change" not "changed" nor "changes"
+* don't capitalize first letter
+* no dot (.) at the end

LICENSE

@@ -1,24 +1,24 @@
-Portainer: Copyright (c) 2016 CloudInovasi
+Portainer: Copyright (c) 2016 Portainer.io
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
 
-UI For Docker: Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com), Anthony Lapenna (anthonylapenna at cloudinovasi dot id)
+Portainer contains code which was originally under this license:
+
+UI For Docker: Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com), Anthony Lapenna (portainer.io)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Procfile

@@ -1 +0,0 @@
-web: portainer -p ":$PORT" -e "$DOCKER_ENDPOINT"

README.md

@@ -1,165 +1,52 @@
-# Portainer
 
-[![Microbadger](https://images.microbadger.com/badges/image/cloudinovasi/portainer.svg)](http://microbadger.com/images/cloudinovasi/portainer "Image size")
+<p align="center">
+  <img title="portainer" src='http://portainer.io/images/logo_alt.png' />
+</p>
+
+[![Microbadger version](https://images.microbadger.com/badges/version/portainer/portainer.svg)](https://microbadger.com/images/portainer/portainer "Latest version on Docker Hub")
+[![Microbadger](https://images.microbadger.com/badges/image/portainer/portainer.svg)](http://microbadger.com/images/portainer/portainer "Image size")
+[![Documentation Status](https://readthedocs.org/projects/portainer/badge/?version=latest)](http://portainer.readthedocs.io/en/latest/?badge=latest)
 [![Gitter](https://badges.gitter.im/portainer/Lobby.svg)](https://gitter.im/portainer/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YHXZJQNJQ36H6)
 
-Portainer is a web interface for the Docker remote API.
+**_Portainer_** is a lightweight management UI which allows you to **easily** manage your Docker host or Swarm cluster.
 
-![Dashboard](/dashboard.png)
+**_Portainer_** is meant to be as **simple** to deploy as it is to use. It consists of a single container that can run on any Docker engine (Docker for Linux and Docker for Windows are supported).
 
-## Supported Docker versions
+**_Portainer_** allows you to manage your Docker containers, images, volumes, networks and more ! It is compatible with the *standalone Docker* engine and with *Docker Swarm*.
 
-The following Docker versions are supported:
+## Demo
 
-* full support for Docker 1.10, 1.11 and 1.12
-* partial support for Docker 1.9 (some features won't be available)
+<img src="http://portainer.io/images/screenshots/portainer.gif" width="77%"/>
 
-## Run
+You can try out the public demo instance: http://demo.portainer.io/ (login with the username **demo** and the password **tryportainer**).
 
-### Quickstart
+Please note that the public demo cluster is **reset every 15min**.
 
-1. Run: `docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer`
+## Getting started
 
-2. Open your browser to `http://<dockerd host ip>:9000`
+* [Deploy Portainer](https://portainer.readthedocs.io/en/latest/deployment.html)
+* [Documentation](https://portainer.readthedocs.io)
 
-Bind mounting the Unix socket into the Portainer container is much more secure than exposing your docker daemon over TCP.
+## Getting help
 
-The `--privileged` flag is required for hosts using SELinux.
+* Issues: https://github.com/portainer/portainer/issues
+* FAQ: https://portainer.readthedocs.io/en/latest/faq.html
+* Gitter (chat): https://gitter.im/portainer/Lobby
+* Slack: http://portainer.io/slack/
 
-### Specify socket to connect to Docker daemon
+## Reporting bugs and contributing
 
-By default Portainer connects to the Docker daemon with`/var/run/docker.sock`. For this to work you need to bind mount the unix socket into the container with `-v /var/run/docker.sock:/var/run/docker.sock`.
+* Want to report a bug or request a feature? Please open [an issue](https://github.com/portainer/portainer/issues/new).
+* Want to help us build **_portainer_**? Follow our [contribution guidelines](https://portainer.readthedocs.io/en/latest/contribute.html) to build it  locally and make a pull request. We need all the help we can get!
 
-You can use the `--host`, `-H` flags to change this socket:
+## Limitations
 
-```
-# Connect to a tcp socket:
-$ docker run -d -p 9000:9000 cloudinovasi/portainer -H tcp://127.0.0.1:2375
-```
+**_Portainer_** has full support for the following Docker versions:
 
-```
-# Connect to another unix socket:
-$ docker run -d -p 9000:9000 cloudinovasi/portainer -H unix:///path/to/docker.sock
-```
+* Docker 1.10 to Docker 1.12 (including `swarm-mode`)
+* Docker Swarm >= 1.2.3
 
-### Swarm support
+Partial support for the following Docker versions (some features may not be available):
 
-**Supported Swarm version: 1.2.3**
-
-You can access a specific view for you Swarm cluster by defining the `--swarm` flag:
-
-```
-# Connect to a tcp socket and enable Swarm:
-$ docker run -d -p 9000:9000 cloudinovasi/portainer -H tcp://<SWARM_HOST>:<SWARM_PORT> --swarm
-```
-
-*NOTE*: Due to Swarm not exposing information in a machine readable way, the app is bound to a specific version of Swarm at the moment.
-
-### Change address/port Portainer is served on
-Portainer listens on port 9000 by default. If you run Portainer inside a container then you can bind the container's internal port to any external address and port:
-
-```
-# Expose Portainer on 10.20.30.1:80
-$ docker run -d -p 10.20.30.1:80:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer
-```
-
-### Access a Docker engine protected via TLS
-
-Ensure that you have access to the CA, the cert and the public key used to access your Docker engine.  
-
-These files will need to be named `ca.pem`, `cert.pem` and `key.pem` respectively. Store them somewhere on your disk and mount a volume containing these files inside the UI container:
-
-```
-$ docker run -d -p 9000:9000 cloudinovasi/portainer -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify
-```
-
-You can also use the `--tlscacert`, `--tlscert` and `--tlskey` flags if you want to change the default path to the CA, certificate and key file respectively:
-
-```
-$ docker run -d -p 9000:9000 cloudinovasi/portainer -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify --tlscacert /certs/myCa.pem --tlscert /certs/myCert.pem --tlskey /certs/myKey.pem
-```
-
-*Note*: Replace `/path/to/certs` to the path to the certificate files on your disk.
-
-### Use your own logo
-
-You can use the `--logo` flag to specify an URL to your own logo.
-
-For example, using the Docker logo:
-
-```
-$ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer --logo "https://www.docker.com/sites/all/themes/docker/assets/images/brand-full.svg"
-```
-
-The custom logo will replace the Portainer logo in the UI.
-
-### Hide containers with specific labels
-
-You can hide specific containers in the containers view by using the `--hide-label` or `-l` options and specifying a label.
-
-For example, take a container started with the label `owner=acme`:
-
-```
-$ docker run -d --label owner=acme nginx
-```
-
-You can hide it in the view by starting the ui with:
-
-```
-$ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer -l owner=acme
-```
-
-### Reverse proxy configuration
-
-Has been tested with Nginx 1.11.
-
-Use the following configuration to host the UI at `myhost.mydomain.com/portainer`:
-
-```nginx
-upstream portainer {
-    server ADDRESS:PORT;
-}
-
-server {
-  listen 80;
-
-  location /portainer/ {
-      proxy_http_version 1.1;
-      proxy_set_header Connection "";
-      proxy_pass http://portainer/;
-  }
-  location /portainer/ws/ {
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-      proxy_http_version 1.1;
-      proxy_pass http://portainer/ws/;
-  }
-}
-```
-
-Replace `ADDRESS:PORT` with the Portainer container details.
-
-### Host your own apps
-
-You can specify an URL to your own templates (**Apps**) definitions using the `--templates` or `-t` flags.
-
-By default, CloudInovasi templates will be used (https://raw.githubusercontent.com/cloud-inovasi/ui-templates/master/templates.json).
-
-For more information about hosting your own template definition and the format, see: https://github.com/cloud-inovasi/ui-templates
-
-### Available options
-
-The following options are available for the `portainer` binary:
-
-* `--host`, `-H`: Docker daemon endpoint (default: `"unix:///var/run/docker.sock"`)
-* `--bind`, `-p`: Address and port to serve Portainer (default: `":9000"`)
-* `--data`, `-d`: Path to the data folder (default: `"."`)
-* `--assets`, `-a`: Path to the assets (default: `"."`)
-* `--swarm`, `-s`: Swarm cluster support (default: `false`)
-* `--tlsverify`: TLS support (default: `false`)
-* `--tlscacert`: Path to the CA (default `/certs/ca.pem`)
-* `--tlscert`: Path to the TLS certificate file (default `/certs/cert.pem`)
-* `--tlskey`: Path to the TLS key (default `/certs/key.pem`)
-* `--hide-label`, `-l`: Hide containers with a specific label in the UI
-* `--logo`: URL to a picture to be displayed as a logo in the UI
-* `--templates`, `-t`: URL to templates (apps) definitions
+* Docker 1.9

api/api.go

@@ -33,6 +33,7 @@ type (
 
 func (a *api) run(settings *Settings) {
 	handler := a.newHandler(settings)
+	log.Printf("Starting portainer on %s", a.bindAddress)
 	if err := http.ListenAndServe(a.bindAddress, handler); err != nil {
 		log.Fatal(err)
 	}

api/handler.go

@@ -17,7 +17,6 @@ func (a *api) newHandler(settings *Settings) http.Handler {
 	)
 
 	handler := a.newAPIHandler()
-	CSRFHandler := newCSRFHandler(a.dataPath)
 
 	mux.Handle("/", fileHandler)
 	mux.Handle("/dockerapi/", http.StripPrefix("/dockerapi", handler))
@@ -28,7 +27,12 @@ func (a *api) newHandler(settings *Settings) http.Handler {
 	mux.HandleFunc("/templates", func(w http.ResponseWriter, r *http.Request) {
 		templatesHandler(w, r, a.templatesURL)
 	})
-	return CSRFHandler(newCSRFWrapper(mux))
+	// CSRF protection is disabled for the moment
+	// CSRFHandler := newCSRFHandler(a.dataPath)
+	// return CSRFHandler(newCSRFWrapper(mux))
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		mux.ServeHTTP(w, r)
+	})
 }
 
 // newAPIHandler initializes a new http.Handler based on the URL scheme

api/main.go

@@ -1,4 +1,4 @@
-package main // import "github.com/cloudinovasi/portainer"
+package main // import "github.com/portainer/portainer"
 
 import (
 	"gopkg.in/alecthomas/kingpin.v2"
@@ -6,7 +6,7 @@ import (
 
 // main is the entry point of the program
 func main() {
-	kingpin.Version("1.8.0")
+	kingpin.Version("1.10.1")
 	var (
 		endpoint  = kingpin.Flag("host", "Dockerd endpoint").Default("unix:///var/run/docker.sock").Short('H').String()
 		addr      = kingpin.Flag("bind", "Address and port to serve Portainer").Default(":9000").Short('p').String()
@@ -19,7 +19,7 @@ func main() {
 		swarm     = kingpin.Flag("swarm", "Swarm cluster support").Default("false").Short('s').Bool()
 		labels    = pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l'))
 		logo      = kingpin.Flag("logo", "URL for the logo displayed in the UI").String()
-		templates = kingpin.Flag("templates", "URL to the templates (apps) definitions").Default("https://raw.githubusercontent.com/cloud-inovasi/ui-templates/master/templates.json").Short('t').String()
+		templates = kingpin.Flag("templates", "URL to the templates (apps) definitions").Default("https://raw.githubusercontent.com/portainer/templates/master/templates.json").Short('t').String()
 	)
 	kingpin.Parse()
 

app/app.js

@@ -18,20 +18,21 @@ angular.module('portainer', [
   'events',
   'images',
   'image',
+  'service',
+  'services',
+  'createService',
   'stats',
   'swarm',
   'network',
   'networks',
   'createNetwork',
+  'task',
   'templates',
   'volumes',
   'createVolume'])
   .config(['$stateProvider', '$urlRouterProvider', '$httpProvider', function ($stateProvider, $urlRouterProvider, $httpProvider) {
     'use strict';
 
-    $httpProvider.defaults.xsrfCookieName = 'csrfToken';
-    $httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token';
-
     $urlRouterProvider.otherwise('/');
 
     $stateProvider
@@ -80,16 +81,21 @@ angular.module('portainer', [
       templateUrl: 'app/components/createContainer/createcontainer.html',
       controller: 'CreateContainerController'
     })
-    .state('actions.create.volume', {
-      url: "/volume",
-      templateUrl: 'app/components/createVolume/createvolume.html',
-      controller: 'CreateVolumeController'
-    })
     .state('actions.create.network', {
       url: "/network",
       templateUrl: 'app/components/createNetwork/createnetwork.html',
       controller: 'CreateNetworkController'
     })
+    .state('actions.create.service', {
+      url: "/service",
+      templateUrl: 'app/components/createService/createservice.html',
+      controller: 'CreateServiceController'
+    })
+    .state('actions.create.volume', {
+      url: "/volume",
+      templateUrl: 'app/components/createVolume/createvolume.html',
+      controller: 'CreateVolumeController'
+    })
     .state('docker', {
       url: '/docker/',
       templateUrl: 'app/components/docker/docker.html',
@@ -120,6 +126,21 @@ angular.module('portainer', [
       templateUrl: 'app/components/network/network.html',
       controller: 'NetworkController'
     })
+    .state('services', {
+      url: '/services/',
+      templateUrl: 'app/components/services/services.html',
+      controller: 'ServicesController'
+    })
+    .state('service', {
+      url: '^/service/:id/',
+      templateUrl: 'app/components/service/service.html',
+      controller: 'ServiceController'
+    })
+    .state('task', {
+      url: '^/task/:id',
+      templateUrl: 'app/components/task/task.html',
+      controller: 'TaskController'
+    })
     .state('templates', {
       url: '/templates/',
       templateUrl: 'app/components/templates/templates.html',
@@ -137,6 +158,8 @@ angular.module('portainer', [
     });
 
     // The Docker API likes to return plaintext errors, this catches them and disp
+    // $httpProvider.defaults.xsrfCookieName = 'csrfToken';
+    // $httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token';
     $httpProvider.interceptors.push(function() {
       return {
         'response': function(response) {
@@ -148,10 +171,11 @@ angular.module('portainer', [
               time: 10000
             });
           }
-          var csrfToken = response.headers('X-Csrf-Token');
-          if (csrfToken) {
-            document.cookie = 'csrfToken=' + csrfToken;
-          }
+          // CSRF protection is disabled for the moment
+          // var csrfToken = response.headers('X-Csrf-Token');
+          // if (csrfToken) {
+          //   document.cookie = 'csrfToken=' + csrfToken;
+          // }
           return response;
         }
       };
@@ -164,4 +188,4 @@ angular.module('portainer', [
   .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred.  If you have a port, prefix it with a ':' i.e. :4243
   .constant('CONFIG_ENDPOINT', 'settings')
   .constant('TEMPLATES_ENDPOINT', 'templates')
-  .constant('UI_VERSION', 'v1.8.0');
+  .constant('UI_VERSION', 'v1.10.1');

app/components/container/container.html

@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    Containers > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a>
+    <a ui-sref="containers">Containers</a> > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a>
   </rd-header-content>
 </rd-header>
 
@@ -13,13 +13,13 @@
       <rd-widget-header icon="fa-cogs" title="Actions"></rd-widget-header>
       <rd-widget-body classes="padding">
         <div class="btn-group" role="group" aria-label="...">
-          <button class="btn btn-primary" ng-click="start()" ng-if="!container.State.Running"><i class="fa fa-play btn-ico" aria-hidden="true"></i>Start</button>
-          <button class="btn btn-danger" ng-click="stop()" ng-if="container.State.Running"><i class="fa fa-stop btn-ico" aria-hidden="true"></i>Stop</button>
-          <button class="btn btn-danger" ng-click="kill()" ng-if="container.State.Running"><i class="fa fa-bomb btn-ico" aria-hidden="true"></i>Kill</button>
-          <button class="btn btn-primary" ng-click="restart()" ng-if="container.State.Running"><i class="fa fa-refresh btn-ico" aria-hidden="true"></i>Restart</button>
-          <button class="btn btn-primary" ng-click="pause()" ng-if="container.State.Running && !container.State.Paused"><i class="fa fa-pause btn-ico" aria-hidden="true"></i>Pause</button>
-          <button class="btn btn-primary" ng-click="unpause()" ng-if="container.State.Paused"><i class="fa fa-play btn-ico" aria-hidden="true"></i>Resume</button>
-          <button class="btn btn-danger" ng-click="remove()" ng-disabled="container.State.Running"><i class="fa fa-trash btn-ico" aria-hidden="true"></i>Remove</button>
+          <button class="btn btn-primary" ng-click="start()" ng-if="!container.State.Running"><i class="fa fa-play space-right" aria-hidden="true"></i>Start</button>
+          <button class="btn btn-danger" ng-click="stop()" ng-if="container.State.Running"><i class="fa fa-stop space-right" aria-hidden="true"></i>Stop</button>
+          <button class="btn btn-danger" ng-click="kill()" ng-if="container.State.Running"><i class="fa fa-bomb space-right" aria-hidden="true"></i>Kill</button>
+          <button class="btn btn-primary" ng-click="restart()" ng-if="container.State.Running"><i class="fa fa-refresh space-right" aria-hidden="true"></i>Restart</button>
+          <button class="btn btn-primary" ng-click="pause()" ng-if="container.State.Running && !container.State.Paused"><i class="fa fa-pause space-right" aria-hidden="true"></i>Pause</button>
+          <button class="btn btn-primary" ng-click="unpause()" ng-if="container.State.Paused"><i class="fa fa-play space-right" aria-hidden="true"></i>Resume</button>
+          <button class="btn btn-danger" ng-click="remove()" ng-disabled="container.State.Running"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button>
         </div>
       </rd-widget-body>
     </rd-widget>
@@ -29,7 +29,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-tasks" title="Container status"></rd-widget-header>
+      <rd-widget-header icon="fa-server" title="Container status"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -52,7 +52,7 @@
             <tr>
               <td>Status</td>
               <td>
-                <i ng-class="{true: 'fa fa-heartbeat text-icon green-icon', false: 'fa fa-heartbeat text-icon red-icon'}[container.State.Running]"></i>
+                <i ng-class="{true: 'fa fa-heartbeat space-right green-icon', false: 'fa fa-heartbeat space-right red-icon'}[container.State.Running]"></i>
                 {{ container.State|getstatetext }} since {{ activityTime }}<span ng-if="!container.State.Running"> with exit code {{ container.State.ExitCode }}</span>
               </td>
             </tr>
@@ -67,9 +67,9 @@
             <tr>
               <td colspan="2">
                 <div class="btn-group" role="group" aria-label="...">
-                  <a class="btn btn-outline-secondary" type="button" ui-sref="stats({id: container.Id})"><i class="fa fa-area-chart btn-ico" aria-hidden="true"></i>Stats</a>
-                  <a class="btn btn-outline-secondary" type="button" ui-sref="logs({id: container.Id})"><i class="fa fa-exclamation-circle btn-ico" aria-hidden="true"></i>Logs</a>
-                  <a class="btn btn-outline-secondary" type="button" ui-sref="console({id: container.Id})"><i class="fa fa-terminal btn-ico" aria-hidden="true"></i>Console</a>
+                  <a class="btn btn-outline-secondary" type="button" ui-sref="stats({id: container.Id})"><i class="fa fa-area-chart space-right" aria-hidden="true"></i>Stats</a>
+                  <a class="btn btn-outline-secondary" type="button" ui-sref="logs({id: container.Id})"><i class="fa fa-exclamation-circle space-right" aria-hidden="true"></i>Logs</a>
+                  <a class="btn btn-outline-secondary" type="button" ui-sref="console({id: container.Id})"><i class="fa fa-terminal space-right" aria-hidden="true"></i>Console</a>
                 </div>
               </td>
             </tr>
@@ -130,7 +130,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-tasks" title="Container details"></rd-widget-header>
+      <rd-widget-header icon="fa-server" title="Container details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -202,3 +202,34 @@
     </rd-widget>
   </div>
 </div>
+
+<div class="row" ng-if="!(container.NetworkSettings.Networks | emptyobject)">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-sitemap" title="Connected networks"></rd-widget-header>
+
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <thead>
+            <th>Network Name</th>
+            <th>IP Address</th>
+            <th>Gateway</th>
+            <th>MacAddress</th>
+            <th>Actions</th>
+          </thead>
+          <tbody>
+            <tr ng-repeat="(key, value) in container.NetworkSettings.Networks">
+              <td><a ui-sref="network({id: value.NetworkID})">{{ key }}</a></td>
+              <td>{{ value.IPAddress || '-' }}</td>
+              <td>{{ value.Gateway || '-' }}</td>
+              <td>{{ value.MacAddress || '-' }}</td>
+              <td>
+                <button type="button" class="btn btn-xs btn-danger" ng-click="containerLeaveNetwork(container, value.NetworkID)"><i class="fa fa-trash space-right" aria-hidden="true"></i>Leave Network</button>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>

app/components/container/containerController.js

@@ -1,6 +1,6 @@
 angular.module('container', [])
-.controller('ContainerController', ['$scope', '$state','$stateParams', '$filter', 'Container', 'ContainerCommit', 'ImageHelper', 'Messages',
-function ($scope, $state, $stateParams, $filter, Container, ContainerCommit, ImageHelper, Messages) {
+.controller('ContainerController', ['$scope', '$state','$stateParams', '$filter', 'Container', 'ContainerCommit', 'ImageHelper', 'Network', 'Messages',
+function ($scope, $state, $stateParams, $filter, Container, ContainerCommit, ImageHelper, Network, Messages) {
   $scope.activityTime = 0;
   $scope.portBindings = [];
   $scope.config = {
@@ -153,5 +153,22 @@ function ($scope, $state, $stateParams, $filter, Container, ContainerCommit, Ima
     $scope.container.edit = false;
   };
 
+  $scope.containerLeaveNetwork = function containerLeaveNetwork(container, networkId) {
+    $('#loadingViewSpinner').show();
+    Network.disconnect({id: networkId}, { Container: $stateParams.id, Force: false }, function (d) {
+      if (d.message) {
+        $('#loadingViewSpinner').hide();
+        Messages.send("Error", {}, d.message);
+      } else {
+        $('#loadingViewSpinner').hide();
+        Messages.send("Container left network", $stateParams.id);
+        $state.go('container', {id: $stateParams.id}, {reload: true});
+      }
+    }, function (e) {
+      $('#loadingViewSpinner').hide();
+      Messages.error("Failure", e, "Unable to disconnect container from network");
+    });
+  };
+
   update();
 }]);

app/components/containerConsole/containerConsole.html

@@ -2,12 +2,12 @@
   <rd-header-title title="Container console">
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
-  <rd-header-content>
-    Containers > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Console
+  <rd-header-content ng-if="state.loaded">
+    <a ui-sref="containers">Containers</a> > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Console
   </rd-header-content>
 </rd-header>
 
-<div class="row">
+<div class="row" ng-if="state.loaded">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
       <rd-widget-header icon="fa-terminal" title="Console">
@@ -16,18 +16,27 @@
         </div>
       </rd-widget-header>
       <rd-widget-body>
-        <form class="form-horizontal">
-          <!-- command-list -->
-          <div class="form-group">
-            <div class="col-sm-3">
-              <select class="selectpicker form-control" ng-model="state.command">
-                <option value="bash">/bin/bash</option>
-                <option value="sh">/bin/sh</option>
-              </select>
+        <form>
+          <div class="row">
+            <!-- command-list -->
+            <div class="col-sm-4">
+              <div class="input-group">
+                <span class="input-group-addon">
+                  <i class="fa fa-linux" aria-hidden="true" ng-if="imageOS == 'linux'"></i>
+                  <i class="fa fa-windows" aria-hidden="true" ng-if="imageOS == 'windows'"></i>
+                </span>
+                <select class="form-control" ng-model="state.command" id="command">
+                  <option value="bash" ng-if="imageOS == 'linux'">/bin/bash</option>
+                  <option value="sh" ng-if="imageOS == 'linux'">/bin/sh</option>
+                  <option value="powershell" ng-if="imageOS == 'windows'">powershell</option>
+                  <option value="cmd.exe" ng-if="imageOS == 'windows'">cmd.exe</option>
+                </select>
+              </div>
             </div>
-            <div class="col-sm-9 pull-left">
-              <button type="button" class="btn btn-primary" ng-click="connect()" ng-disabled="connected">Connect</button>
-              <button type="button" class="btn btn-default" ng-click="disconnect()" ng-disabled="!connected">Disconnect</button>
+            <!-- !command-list -->
+            <div class="col-sm-8">
+              <button type="button" class="btn btn-primary" ng-click="connect()" ng-disabled="state.connected">Connect</button>
+              <button type="button" class="btn btn-default" ng-click="disconnect()" ng-disabled="!state.connected">Disconnect</button>
             </div>
           </div>
         </form>

app/components/containerConsole/containerConsoleController.js

@@ -1,21 +1,37 @@
 angular.module('containerConsole', [])
-.controller('ContainerConsoleController', ['$scope', '$stateParams', 'Settings', 'Container', 'Exec', '$timeout', 'Messages',
-function ($scope, $stateParams, Settings, Container, Exec, $timeout, Messages) {
+.controller('ContainerConsoleController', ['$scope', '$stateParams', 'Settings', 'Container', 'Image', 'Exec', '$timeout', 'Messages',
+function ($scope, $stateParams, Settings, Container, Image, Exec, $timeout, Messages) {
   $scope.state = {};
-  $scope.state.command = "bash";
-  $scope.connected = false;
+  $scope.state.loaded = false;
+  $scope.state.connected = false;
 
   var socket, term;
 
   // Ensure the socket is closed before leaving the view
   $scope.$on('$stateChangeStart', function (event, next, current) {
-    if (socket !== null) {
+    if (socket && socket !== null) {
       socket.close();
     }
   });
 
   Container.get({id: $stateParams.id}, function(d) {
     $scope.container = d;
+    if (d.message) {
+      Messages.error("Error", d, 'Unable to retrieve container details');
+      $('#loadingViewSpinner').hide();
+    } else {
+      Image.get({id: d.Image}, function(imgData) {
+        $scope.imageOS = imgData.Os;
+        $scope.state.command = imgData.Os === 'windows' ? 'powershell' : 'bash';
+        $scope.state.loaded = true;
+        $('#loadingViewSpinner').hide();
+      }, function (e) {
+        Messages.error("Failure", e, 'Unable to retrieve image details');
+        $('#loadingViewSpinner').hide();
+      });
+    }
+  }, function (e) {
+    Messages.error("Failure", e, 'Unable to retrieve container details');
     $('#loadingViewSpinner').hide();
   });
 
@@ -54,7 +70,7 @@ function ($scope, $stateParams, Settings, Container, Exec, $timeout, Messages) {
   };
 
   $scope.disconnect = function() {
-    $scope.connected = false;
+    $scope.state.connected = false;
     if (socket !== null) {
       socket.close();
     }
@@ -79,31 +95,26 @@ function ($scope, $stateParams, Settings, Container, Exec, $timeout, Messages) {
   function initTerm(url, height, width) {
     socket = new WebSocket(url);
 
-    $scope.connected = true;
+    $scope.state.connected = true;
     socket.onopen = function(evt) {
       $('#loadConsoleSpinner').hide();
-      term = new Terminal({
-        cols: width,
-        rows: height,
-        cursorBlink: true
-      });
+      term = new Terminal();
 
       term.on('data', function (data) {
         socket.send(data);
       });
       term.open(document.getElementById('terminal-container'));
+      term.resize(width, height);
+      term.setOption('cursorBlink', true);
 
       socket.onmessage = function (e) {
         term.write(e.data);
       };
       socket.onerror = function (error) {
-        $scope.connected = false;
-
+        $scope.state.connected = false;
       };
       socket.onclose = function(evt) {
-        $scope.connected = false;
-        // term.write("Session terminated");
-        // term.destroy();
+        $scope.state.connected = false;
       };
     };
   }

app/components/containerLogs/containerlogs.html

@@ -3,7 +3,7 @@
       <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    Containers > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Logs
+    <a ui-sref="containers">Containers</a> > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Logs
   </rd-header-content>
 </rd-header>
 
@@ -12,7 +12,7 @@
     <rd-widget>
       <rd-widget-body>
         <div class="widget-icon grey pull-left">
-          <i class="fa fa-tasks"></i>
+          <i class="fa fa-server"></i>
         </div>
         <div class="title">{{ container.Name|trimcontainername }}</div>
         <div class="comment">Name</div>

app/components/containers/containers.html

@@ -9,7 +9,7 @@
 
 <div class="col-lg-12">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Containers">
+    <rd-widget-header icon="fa-server" title="Containers">
       <div class="pull-right">
         <i id="loadContainersSpinner" class="fa fa-cog fa-2x fa-spin" style="margin-top: 5px;"></i>
       </div>
@@ -17,15 +17,15 @@
     <rd-widget-taskbar classes="col-lg-12">
       <div class="pull-left">
         <div class="btn-group" role="group" aria-label="...">
-          <button type="button" class="btn btn-primary" ng-click="startAction()" ng-disabled="!state.selectedItemCount">Start</button>
-          <button type="button" class="btn btn-primary" ng-click="stopAction()" ng-disabled="!state.selectedItemCount">Stop</button>
-          <button type="button" class="btn btn-primary" ng-click="killAction()" ng-disabled="!state.selectedItemCount">Kill</button>
-          <button type="button" class="btn btn-primary" ng-click="restartAction()" ng-disabled="!state.selectedItemCount">Restart</button>
-          <button type="button" class="btn btn-primary" ng-click="pauseAction()" ng-disabled="!state.selectedItemCount">Pause</button>
-          <button type="button" class="btn btn-primary" ng-click="unpauseAction()" ng-disabled="!state.selectedItemCount">Unpause</button>
-          <button type="button" class="btn btn-danger" ng-click="removeAction()" ng-disabled="!state.selectedItemCount">Remove</button>
+          <button type="button" class="btn btn-primary btn-responsive" ng-click="startAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-play space-right" aria-hidden="true"></i>Start</button>
+          <button type="button" class="btn btn-primary btn-responsive" ng-click="stopAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-stop space-right" aria-hidden="true"></i>Stop</button>
+          <button type="button" class="btn btn-primary btn-responsive" ng-click="killAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-bomb space-right" aria-hidden="true"></i>Kill</button>
+          <button type="button" class="btn btn-primary btn-responsive" ng-click="restartAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-refresh space-right" aria-hidden="true"></i>Restart</button>
+          <button type="button" class="btn btn-primary btn-responsive" ng-click="pauseAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-pause space-right" aria-hidden="true"></i>Pause</button>
+          <button type="button" class="btn btn-primary btn-responsive" ng-click="unpauseAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-play space-right" aria-hidden="true"></i>Resume</button>
+          <button type="button" class="btn btn-danger btn-responsive" ng-click="removeAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button>
         </div>
-        <a class="btn btn-default" type="button" ui-sref="actions.create.container">Add container</a>
+        <a class="btn btn-default btn-responsive" type="button" ui-sref="actions.create.container">Add container</a>
       </div>
       <div class="pull-right">
         <input type="checkbox" ng-model="state.displayAll" id="displayAll" ng-change="toggleGetAll()" style="margin-top: -2px; margin-right: 5px;"/><label for="displayAll">Show all containers</label>
@@ -41,8 +41,8 @@
               <th>
                 <a ui-sref="containers" ng-click="order('Status')">
                   State
-                  <span ng-show="sortType == 'State' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'State' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  <span ng-show="sortType == 'Status' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Status' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
@@ -66,7 +66,7 @@
                   <span ng-show="sortType == 'IP' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
-              <th ng-if="swarm">
+              <th ng-if="swarm && !swarm_mode">
                 <a ui-sref="containers" ng-click="order('Host')">
                   Host IP
                   <span ng-show="sortType == 'Host' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
@@ -86,18 +86,24 @@
             <tr ng-repeat="container in (state.filteredContainers = ( containers | filter:state.filter | orderBy:sortType:sortReverse))">
               <td><input type="checkbox" ng-model="container.Checked" ng-change="selectItem(container)"/></td>
               <td><span class="label label-{{ container.Status|containerstatusbadge }}">{{ container.Status|containerstatus }}</span></td>
-              <td ng-if="swarm"><a ui-sref="container({id: container.Id})">{{ container|swarmcontainername}}</a></td>
-              <td ng-if="!swarm"><a ui-sref="container({id: container.Id})">{{ container|containername}}</a></td>
+              <td ng-if="swarm && !swarm_mode"><a ui-sref="container({id: container.Id})">{{ container|swarmcontainername}}</a></td>
+              <td ng-if="!swarm || swarm_mode"><a ui-sref="container({id: container.Id})">{{ container|containername}}</a></td>
               <td><a ui-sref="image({id: container.Image})">{{ container.Image }}</a></td>
               <td ng-if="state.displayIP">{{ container.IP ? container.IP : '-' }}</td>
-              <td ng-if="swarm">{{ container.hostIP }}</td>
+              <td ng-if="swarm && !swarm_mode">{{ container.hostIP }}</td>
               <td>
                 <a ng-if="container.Ports.length > 0" ng-repeat="p in container.Ports" class="image-tag" ng-href="http://{{p.host}}:{{p.public}}" target="_blank">
-                  <i class="fa fa-external-link" aria-hidden="true"></i> {{ p.private }}
+                  <i class="fa fa-external-link" aria-hidden="true"></i> {{p.public}}:{{ p.private }}
                 </a>
                 <span ng-if="container.Ports.length == 0" >-</span>
               </td>
             </tr>
+            <tr ng-if="!containers">
+              <td colspan="8" class="text-center text-muted">Loading...</td>
+            </tr>
+            <tr ng-if="containers.length == 0">
+              <td colspan="8" class="text-center text-muted">No containers available.</td>
+            </tr>
           </tbody>
         </table>
       </div>

app/components/containers/containersController.js

@@ -1,13 +1,13 @@
 angular.module('containers', [])
 .controller('ContainersController', ['$scope', 'Container', 'ContainerHelper', 'Info', 'Settings', 'Messages', 'Config',
 function ($scope, Container, ContainerHelper, Info, Settings, Messages, Config) {
-
   $scope.state = {};
   $scope.state.displayAll = Settings.displayAll;
   $scope.state.displayIP = false;
   $scope.sortType = 'State';
   $scope.sortReverse = false;
   $scope.state.selectedItemCount = 0;
+  $scope.swarm_mode = false;
 
   $scope.order = function (sortType) {
     $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
@@ -27,12 +27,16 @@ function ($scope, Container, ContainerHelper, Info, Settings, Messages, Config)
         if (model.IP) {
           $scope.state.displayIP = true;
         }
-        if ($scope.swarm) {
+        if ($scope.swarm && !$scope.swarm_mode) {
           model.hostIP = $scope.swarm_hosts[_.split(container.Names[0], '/')[1]];
         }
         return model;
       });
       $('#loadContainersSpinner').hide();
+    }, function (e) {
+      $('#loadContainersSpinner').hide();
+      Messages.error("Failure", e, "Unable to retrieve containers");
+      $scope.containers = [];
     });
   };
 
@@ -151,7 +155,11 @@ function ($scope, Container, ContainerHelper, Info, Settings, Messages, Config)
     $scope.swarm = c.swarm;
     if (c.swarm) {
       Info.get({}, function (d) {
-        $scope.swarm_hosts = retrieveSwarmHostsInfo(d);
+        if (!_.startsWith(d.ServerVersion, 'swarm')) {
+          $scope.swarm_mode = true;
+        } else {
+          $scope.swarm_hosts = retrieveSwarmHostsInfo(d);
+        }
         update({all: Settings.displayAll ? 1 : 0});
       });
     } else {

app/components/createContainer/createContainerController.js

@@ -1,21 +1,19 @@
 angular.module('createContainer', [])
-.controller('CreateContainerController', ['$scope', '$state', 'Config', 'Container', 'Image', 'Volume', 'Network', 'Messages',
-function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
-
-  $scope.state = {
-    alwaysPull: true
-  };
+.controller('CreateContainerController', ['$scope', '$state', '$stateParams', '$filter', 'Config', 'Info', 'Container', 'ContainerHelper', 'Image', 'Volume', 'Network', 'Messages',
+function ($scope, $state, $stateParams, $filter, Config, Info, Container, ContainerHelper, Image, Volume, Network, Messages) {
 
   $scope.formValues = {
+    alwaysPull: true,
     Console: 'none',
     Volumes: [],
-    AvailableRegistries: [],
-    Registry: ''
+    Registry: '',
+    NetworkContainer: ''
   };
 
   $scope.imageConfig = {};
 
   $scope.config = {
+    Image: '',
     Env: [],
     ExposedPorts: {},
     HostConfig: {
@@ -54,9 +52,13 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
   };
 
   Config.$promise.then(function (c) {
-    var swarm = c.swarm;
-
-    $scope.formValues.AvailableRegistries = c.registries;
+    $scope.swarm = c.swarm;
+    Info.get({}, function(info) {
+      if ($scope.swarm && !_.startsWith(info.ServerVersion, 'swarm')) {
+        $scope.swarm_mode = true;
+      }
+    });
+    var containersToHideLabels = c.hiddenLabels;
 
     Volume.query({}, function (d) {
       $scope.availableVolumes = d.Volumes;
@@ -66,7 +68,7 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
 
     Network.query({}, function (d) {
       var networks = d;
-      if (swarm) {
+      if ($scope.swarm) {
         networks = d.filter(function (network) {
           if (network.Scope === 'global') {
             return network;
@@ -77,10 +79,24 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
         networks.push({Name: "host"});
         networks.push({Name: "none"});
       }
+      networks.push({Name: "container"});
       $scope.availableNetworks = networks;
+      if (!_.find(networks, {'Name': 'bridge'})) {
+        $scope.config.HostConfig.NetworkMode = 'nat';
+      }
     }, function (e) {
       Messages.error("Failure", e, "Unable to retrieve networks");
     });
+
+    Container.query({}, function (d) {
+      var containers = d;
+      if (containersToHideLabels) {
+        containers = ContainerHelper.hideContainers(d, containersToHideLabels);
+      }
+      $scope.runningContainers = containers;
+    }, function(e) {
+      Messages.error("Failure", e, "Unable to retrieve running containers");
+    });
   });
 
   // TODO: centralize, already present in templatesController
@@ -151,10 +167,10 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
   function preparePortBindings(config) {
     var bindings = {};
     config.HostConfig.PortBindings.forEach(function (portBinding) {
-      if (portBinding.hostPort && portBinding.containerPort) {
+      if (portBinding.containerPort) {
         var key = portBinding.containerPort + "/" + portBinding.protocol;
         var binding = {};
-        if (portBinding.hostPort.indexOf(':') > -1) {
+        if (portBinding.hostPort && portBinding.hostPort.indexOf(':') > -1) {
           var hostAndPort = portBinding.hostPort.split(':');
           binding.HostIp = hostAndPort[0];
           binding.HostPort = hostAndPort[1];
@@ -214,8 +230,26 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
     config.Volumes = volumes;
   }
 
+  function prepareNetworkConfig(config) {
+    var mode = config.HostConfig.NetworkMode;
+    var container = $scope.formValues.NetworkContainer;
+    var containerName = container;
+    if (container && typeof container === 'object') {
+      containerName = $filter('trimcontainername')(container.Names[0]);
+      if ($scope.swarm && !$scope.swarm_mode) {
+        containerName = $filter('swarmcontainername')(container);
+      }
+    }
+    var networkMode = mode;
+    if (containerName) {
+      networkMode += ':' + containerName;
+    }
+    config.HostConfig.NetworkMode = networkMode;
+  }
+
   function prepareConfiguration() {
     var config = angular.copy($scope.config);
+    prepareNetworkConfig(config);
     prepareImageConfig(config);
     preparePortBindings(config);
     prepareConsole(config);
@@ -227,11 +261,10 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
   $scope.create = function () {
     var config = prepareConfiguration();
     $('#createContainerSpinner').show();
-    if ($scope.state.alwaysPull) {
+    if ($scope.formValues.alwaysPull) {
       pullImageAndCreateContainer(config);
     } else {
       createContainer(config);
     }
   };
-
 }]);

app/components/createContainer/createcontainer.html

@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title="Create container"></rd-header-title>
   <rd-header-content>
-    Containers > Add container
+    <a ui-sref="containers">Containers</a> > Add container
   </rd-header-content>
 </rd-header>
 
@@ -31,7 +31,7 @@
             <div class="col-sm-offset-1 col-sm-11">
               <div class="checkbox">
                 <label>
-                  <input type="checkbox" ng-model="state.alwaysPull"> Always pull image before creating
+                  <input type="checkbox" ng-model="formValues.alwaysPull"> Always pull image before creating
                 </label>
               </div>
             </div>
@@ -53,6 +53,10 @@
                 <input type="radio" name="container_restart_policy" ng-model="config.HostConfig.RestartPolicy.Name" value="on-failure">
                 <span class="radio-value">On failure</span>
               </label>
+              <label class="radio-inline">
+                <input type="radio" name="container_restart_policy" ng-model="config.HostConfig.RestartPolicy.Name" value="unless-stopped">
+                <span class="radio-value">Unless stopped</span>
+              </label>
             </div>
           </div>
           <!-- !restart-policy -->
@@ -60,7 +64,7 @@
           <div class="form-group">
             <label for="container_ports" class="col-sm-1 control-label text-left">Port mapping</label>
             <div class="col-sm-11">
-              <span class="label label-default clickable" ng-click="addPortBinding()">
+              <span class="label label-default interactive" ng-click="addPortBinding()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> map port
               </span>
             </div>
@@ -69,7 +73,7 @@
               <div ng-repeat="portBinding in config.HostConfig.PortBindings" style="margin-top: 2px;">
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">host</span>
-                  <input type="text" class="form-control" ng-model="portBinding.hostPort" placeholder="e.g. 80 or 1.2.3.4:80">
+                  <input type="text" class="form-control" ng-model="portBinding.hostPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)">
                 </div>
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">container</span>
@@ -102,10 +106,10 @@
     <rd-widget>
       <rd-widget-body>
         <ul class="nav nav-tabs">
-          <li class="active clickable"><a data-target="#command" data-toggle="tab">Command</a></li>
-          <li class="clickable"><a data-target="#volumes" data-toggle="tab">Volumes</a></li>
-          <li class="clickable"><a data-target="#network" data-toggle="tab">Network</a></li>
-          <li class="clickable"><a data-target="#security" data-toggle="tab">Security/Host</a></li>
+          <li class="active interactive"><a data-target="#command" data-toggle="tab">Command</a></li>
+          <li class="interactive"><a data-target="#volumes" data-toggle="tab">Volumes</a></li>
+          <li class="interactive"><a data-target="#network" data-toggle="tab">Network</a></li>
+          <li class="interactive"><a data-target="#security" data-toggle="tab">Security/Host</a></li>
         </ul>
         <!-- tab-content -->
         <div class="tab-content">
@@ -177,7 +181,7 @@
               <div class="form-group">
                 <label for="container_env" class="col-sm-1 control-label text-left">Environment variables</label>
                 <div class="col-sm-11">
-                  <span class="label label-default clickable" ng-click="addEnvironmentVariable()">
+                  <span class="label label-default interactive" ng-click="addEnvironmentVariable()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> environment variable
                   </span>
                 </div>
@@ -212,7 +216,7 @@
               <div class="form-group">
                 <label for="container_volumes" class="col-sm-1 control-label text-left">Volumes</label>
                 <div class="col-sm-11">
-                  <span class="label label-default clickable" ng-click="addVolume()">
+                  <span class="label label-default interactive" ng-click="addVolume()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> volume
                   </span>
                 </div>
@@ -254,7 +258,7 @@
           <!-- tab-network -->
           <div class="tab-pane" id="network">
             <form class="form-horizontal" style="margin-top: 15px;">
-              <div class="form-group" ng-if="globalNetworkCount === 0">
+              <div class="form-group" ng-if="globalNetworkCount === 0 && !swarm_mode">
                 <div class="col-sm-12">
                   <span class="small text-muted">You don't have any shared network. Head over the <a ui-sref="networks">networks view</a> to create one.</span>
                 </div>
@@ -263,13 +267,26 @@
               <div class="form-group">
                 <label for="container_network" class="col-sm-1 control-label text-left">Network</label>
                 <div class="col-sm-9">
-                  <select class="selectpicker form-control" ng-model="config.HostConfig.NetworkMode">
+                  <select class="selectpicker form-control" ng-model="config.HostConfig.NetworkMode" id="container_network">
                     <option selected disabled hidden value="">Select a network</option>
                     <option ng-repeat="net in availableNetworks" ng-value="net.Name">{{ net.Name }}</option>
                   </select>
                 </div>
               </div>
               <!-- !network-input -->
+              <!-- container-name-input -->
+              <div class="form-group" ng-if="config.HostConfig.NetworkMode == 'container'">
+                <label for="container_network_container" class="col-sm-1 control-label text-left">Container</label>
+                <div class="col-sm-9">
+                  <select ng-if="(!swarm || swarm && swarm_mode)" ng-options="container|containername for container in runningContainers" class="selectpicker form-control" ng-model="formValues.NetworkContainer">
+                    <option selected disabled hidden value="">Select a container</option>
+                  </select>
+                  <select ng-if="swarm && !swarm_mode" ng-options="container|swarmcontainername for container in runningContainers" class="selectpicker form-control" ng-model="formValues.NetworkContainer">
+                    <option selected disabled hidden value="">Select a container</option>
+                  </select>
+                </div>
+              </div>
+              <!-- !container-name-input -->
               <!-- hostname-input -->
               <div class="form-group">
                 <label for="container_hostname" class="col-sm-1 control-label text-left">Hostname</label>

app/components/createNetwork/createNetworkController.js

@@ -11,7 +11,10 @@ function ($scope, $state, Messages, Network) {
     Driver: 'bridge',
     CheckDuplicate: true,
     Internal: false,
+    // Force IPAM Driver to 'default', should not be required.
+    // See: https://github.com/docker/docker/issues/25735
     IPAM: {
+      Driver: 'default',
       Config: []
     }
   };

app/components/createNetwork/createnetwork.html

@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title="Create network"></rd-header-title>
   <rd-header-content>
-    Networks > Add network
+    <a ui-sref="networks">Networks</a> > Add network
   </rd-header-content>
 </rd-header>
 
@@ -42,7 +42,7 @@
           <div class="form-group">
             <label for="network_driveropts" class="col-sm-1 control-label text-left">Driver options</label>
             <div class="col-sm-11">
-              <span class="label label-default clickable" ng-click="addDriverOption()">
+              <span class="label label-default interactive" ng-click="addDriverOption()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> driver option
               </span>
             </div>
@@ -89,7 +89,7 @@
     <div>
       <i id="createNetworkSpinner" class="fa fa-cog fa-3x fa-spin" style="margin-bottom: 5px; display: none;"></i>
     </div>
-    <button type="button" class="btn btn-default btn-lg" ng-click="create()">Create</button>
+    <button type="button" class="btn btn-default btn-lg" ng-disabled="!config.Name" ng-click="create()">Create</button>
     <a type="button" class="btn btn-default btn-lg" ui-sref="networks">Cancel</a>
   </div>
 </div>

app/components/createService/createServiceController.js

@@ -0,0 +1,198 @@
+angular.module('createService', [])
+.controller('CreateServiceController', ['$scope', '$state', 'Service', 'Volume', 'Network', 'ImageHelper', 'Messages',
+function ($scope, $state, Service, Volume, Network, ImageHelper, Messages) {
+
+  $scope.formValues = {
+    Name: '',
+    Image: '',
+    Registry: '',
+    Mode: 'replicated',
+    Replicas: 1,
+    Command: '',
+    WorkingDir: '',
+    User: '',
+    Env: [],
+    Labels: [],
+    Volumes: [],
+    Network: '',
+    ExtraNetworks: [],
+    Ports: []
+  };
+
+  $scope.addPortBinding = function() {
+    $scope.formValues.Ports.push({ PublishedPort: '', TargetPort: '', Protocol: 'tcp' });
+  };
+
+  $scope.removePortBinding = function(index) {
+    $scope.formValues.Ports.splice(index, 1);
+  };
+
+  $scope.addExtraNetwork = function() {
+    $scope.formValues.ExtraNetworks.push({ Name: '' });
+  };
+
+  $scope.removeExtraNetwork = function(index) {
+    $scope.formValues.ExtraNetworks.splice(index, 1);
+  };
+
+  $scope.addVolume = function() {
+    $scope.formValues.Volumes.push({ name: '', containerPath: '' });
+  };
+
+  $scope.removeVolume = function(index) {
+    $scope.formValues.Volumes.splice(index, 1);
+  };
+
+  $scope.addEnvironmentVariable = function() {
+    $scope.formValues.Env.push({ name: '', value: ''});
+  };
+
+  $scope.removeEnvironmentVariable = function(index) {
+    $scope.formValues.Env.splice(index, 1);
+  };
+
+  $scope.addLabel = function() {
+    $scope.formValues.Labels.push({ name: '', value: ''});
+  };
+
+  $scope.removeLabel = function(index) {
+    $scope.formValues.Labels.splice(index, 1);
+  };
+
+  function prepareImageConfig(config, input) {
+    var imageConfig = ImageHelper.createImageConfig(input.Image, input.Registry);
+    config.TaskTemplate.ContainerSpec.Image = imageConfig.repo + ':' + imageConfig.tag;
+  }
+
+  function preparePortsConfig(config, input) {
+    var ports = [];
+    input.Ports.forEach(function (binding) {
+      if (binding.PublishedPort && binding.TargetPort) {
+        ports.push({ PublishedPort: +binding.PublishedPort, TargetPort: +binding.TargetPort, Protocol: binding.Protocol });
+      }
+    });
+    config.EndpointSpec.Ports = ports;
+  }
+
+  function prepareSchedulingConfig(config, input) {
+    if (input.Mode === 'replicated') {
+      config.Mode.Replicated = {
+        Replicas: input.Replicas
+      };
+    } else {
+      config.Mode.Global = {};
+    }
+  }
+
+  function prepareCommandConfig(config, input) {
+    if (input.Command) {
+      config.TaskTemplate.ContainerSpec.Command = _.split(input.Command, ' ');
+    }
+    if (input.User) {
+      config.TaskTemplate.ContainerSpec.User = input.User;
+    }
+    if (input.WorkingDir) {
+      config.TaskTemplate.ContainerSpec.Dir = input.WorkingDir;
+    }
+  }
+
+  function prepareEnvConfig(config, input) {
+    var env = [];
+    input.Env.forEach(function (v) {
+      if (v.name && v.value) {
+        env.push(v.name + "=" + v.value);
+      }
+    });
+    config.TaskTemplate.ContainerSpec.Env = env;
+  }
+
+  function prepareLabelsConfig(config, input) {
+    var labels = {};
+    input.Labels.forEach(function (label) {
+      if (label.name && label.value) {
+          labels[label.name] = label.value;
+      }
+    });
+    config.TaskTemplate.ContainerSpec.Labels = labels;
+  }
+
+  function prepareVolumes(config, input) {
+    input.Volumes.forEach(function (volume) {
+      if (volume.Source && volume.Target) {
+        var mount = {};
+        mount.Type = volume.Bind ? 'bind' : 'volume';
+        mount.ReadOnly = volume.ReadOnly ? true : false;
+        mount.Source = volume.Source;
+        mount.Target = volume.Target;
+        config.TaskTemplate.ContainerSpec.Mounts.push(mount);
+      }
+    });
+  }
+
+  function prepareNetworks(config, input) {
+    var networks = [];
+    if (input.Network) {
+      networks.push({ Target: input.Network });
+    }
+    input.ExtraNetworks.forEach(function (network) {
+      networks.push({ Target: network.Name });
+    });
+    config.Networks = _.uniqWith(networks, _.isEqual);
+  }
+
+  function prepareConfiguration() {
+    var input = $scope.formValues;
+    var config = {
+      Name: input.Name,
+      TaskTemplate: {
+        ContainerSpec: {
+          Mounts: []
+        }
+      },
+      Mode: {},
+      EndpointSpec: {}
+    };
+    prepareSchedulingConfig(config, input);
+    prepareImageConfig(config, input);
+    preparePortsConfig(config, input);
+    prepareCommandConfig(config, input);
+    prepareEnvConfig(config, input);
+    prepareLabelsConfig(config, input);
+    prepareVolumes(config, input);
+    prepareNetworks(config, input);
+    return config;
+  }
+
+  function createNewService(config) {
+    Service.create(config, function (d) {
+      $('#createServiceSpinner').hide();
+      Messages.send('Service created', d.ID);
+      $state.go('services', {}, {reload: true});
+    }, function (e) {
+      $('#createServiceSpinner').hide();
+      Messages.error("Failure", e, 'Unable to create service');
+    });
+  }
+
+  $scope.create = function createService() {
+    $('#createServiceSpinner').show();
+    var config = prepareConfiguration();
+    createNewService(config);
+  };
+
+  Volume.query({}, function (d) {
+    $scope.availableVolumes = d.Volumes;
+  }, function (e) {
+    Messages.error("Failure", e, "Unable to retrieve volumes");
+  });
+
+  Network.query({}, function (d) {
+    $scope.availableNetworks = d.filter(function (network) {
+      if (network.Scope === 'swarm') {
+        return network;
+      }
+    });
+  }, function (e) {
+    Messages.error("Failure", e, "Unable to retrieve networks");
+  });
+}]);

app/components/createService/createservice.html

@@ -0,0 +1,309 @@
+<rd-header>
+  <rd-header-title title="Create service"></rd-header-title>
+  <rd-header-content>
+    <a ui-sref="services">Services</a> > Add service
+  </rd-header-content>
+</rd-header>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-body>
+        <form class="form-horizontal">
+          <!-- name-input -->
+          <div class="form-group">
+            <label for="service_name" class="col-sm-1 control-label text-left">Name</label>
+            <div class="col-sm-11">
+              <input type="text" class="form-control" ng-model="formValues.Name" id="service_name" placeholder="e.g. myService">
+            </div>
+          </div>
+          <!-- !name-input -->
+          <!-- image-and-registry-inputs -->
+          <div class="form-group">
+            <label for="service_image" class="col-sm-1 control-label text-left">Image</label>
+            <div class="col-sm-7">
+              <input type="text" class="form-control" ng-model="formValues.Image" id="service_image" placeholder="e.g. nginx:latest">
+            </div>
+            <label for="image_registry" class="col-sm-1 control-label text-left">Registry</label>
+            <div class="col-sm-3">
+              <input type="text" class="form-control" ng-model="formValues.Registry" id="image_registry" placeholder="leave empty to use DockerHub">
+            </div>
+          </div>
+          <!-- !image-and-registry-inputs -->
+          <!-- scheduling-mode -->
+          <div class="form-group">
+            <label class="col-sm-1 control-label text-left">Scheduling mode</label>
+            <div class="col-sm-11">
+              <label class="radio-inline">
+                <input type="radio" name="service_scheduling" ng-model="formValues.Mode" value="global">
+                Global
+              </label>
+              <label class="radio-inline">
+                <input type="radio" name="service_scheduling" ng-model="formValues.Mode" value="replicated">
+                Replicated
+              </label>
+            </div>
+          </div>
+          <div class="form-group" ng-if="formValues.Mode === 'replicated'">
+            <label for="replicas" class="col-sm-1 control-label text-left">Replicas</label>
+            <div class="col-sm-1">
+              <input type="number" class="form-control" ng-model="formValues.Replicas" id="replicas" placeholder="e.g. 3">
+            </div>
+            <div class="col-sm-10"></div>
+          </div>
+          <!-- !scheduling-mode -->
+          <!-- port-mapping -->
+          <div class="form-group">
+            <label for="container_ports" class="col-sm-1 control-label text-left">Port mapping</label>
+            <div class="col-sm-11">
+              <span class="label label-default interactive" ng-click="addPortBinding()">
+                <i class="fa fa-plus-circle" aria-hidden="true"></i> map port
+              </span>
+            </div>
+            <!-- port-mapping-input-list -->
+            <div class="col-sm-offset-1 col-sm-11 form-inline" style="margin-top: 10px;">
+              <div ng-repeat="portBinding in formValues.Ports" style="margin-top: 2px;">
+                <div class="input-group col-sm-5 input-group-sm">
+                  <span class="input-group-addon">host</span>
+                  <input type="text" class="form-control" ng-model="portBinding.PublishedPort" placeholder="e.g. 8080">
+                </div>
+                <div class="input-group col-sm-5 input-group-sm">
+                  <span class="input-group-addon">container</span>
+                  <input type="text" class="form-control" ng-model="portBinding.TargetPort" placeholder="e.g. 80">
+                </div>
+                <div class="input-group col-sm-1 input-group-sm">
+                  <select class="selectpicker form-control" ng-model="portBinding.Protocol">
+                    <option value="tcp">tcp</option>
+                    <option value="udp">udp</option>
+                  </select>
+                  <span class="input-group-btn">
+                    <button class="btn btn-default" type="button" ng-click="removePortBinding($index)">
+                      <i class="fa fa-minus" aria-hidden="true"></i>
+                    </button>
+                  </span>
+                </div>
+              </div>
+            </div>
+            <!-- !port-mapping-input-list -->
+          </div>
+          <!-- !port-mapping -->
+        </form>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-body>
+        <ul class="nav nav-tabs">
+          <li class="active interactive"><a data-target="#command" data-toggle="tab">Command</a></li>
+          <li class="interactive"><a data-target="#volumes" data-toggle="tab">Volumes</a></li>
+          <li class="interactive"><a data-target="#network" data-toggle="tab">Network</a></li>
+          <li class="interactive"><a data-target="#labels" data-toggle="tab">Labels</a></li>
+        </ul>
+        <!-- tab-content -->
+        <div class="tab-content">
+          <!-- tab-command -->
+          <div class="tab-pane active" id="command">
+            <form class="form-horizontal" style="margin-top: 15px;">
+              <!-- command-input -->
+              <div class="form-group">
+                <label for="service_command" class="col-sm-1 control-label text-left">Command</label>
+                <div class="col-sm-9">
+                  <input type="text" class="form-control" ng-model="formValues.Command" id="service_command" placeholder="e.g. /usr/bin/nginx -t -c /mynginx.conf">
+                </div>
+              </div>
+              <!-- !command-input -->
+              <!-- workdir-user-input -->
+              <div class="form-group">
+                <label for="service_workingdir" class="col-sm-1 control-label text-left">Working Dir</label>
+                <div class="col-sm-4">
+                  <input type="text" class="form-control" ng-model="formValues.WorkingDir" id="service_workingdir" placeholder="e.g. /myapp">
+                </div>
+                <label for="service_user" class="col-sm-1 control-label text-left">User</label>
+                <div class="col-sm-4">
+                  <input type="text" class="form-control" ng-model="formValues.User" id="service_user" placeholder="e.g. nginx">
+                </div>
+              </div>
+              <!-- !workdir-user-input -->
+              <!-- environment-variables -->
+              <div class="form-group">
+                <label for="service_env" class="col-sm-1 control-label text-left">Environment variables</label>
+                <div class="col-sm-11">
+                  <span class="label label-default interactive" ng-click="addEnvironmentVariable()">
+                    <i class="fa fa-plus-circle" aria-hidden="true"></i> environment variable
+                  </span>
+                </div>
+                <!-- environment-variable-input-list -->
+                <div class="col-sm-offset-1 col-sm-11 form-inline" style="margin-top: 10px;">
+                  <div ng-repeat="variable in formValues.Env" style="margin-top: 2px;">
+                    <div class="input-group col-sm-5 input-group-sm">
+                      <span class="input-group-addon">name</span>
+                      <input type="text" class="form-control" ng-model="variable.name" placeholder="e.g. FOO">
+                    </div>
+                    <div class="input-group col-sm-5 input-group-sm">
+                      <span class="input-group-addon">value</span>
+                      <input type="text" class="form-control" ng-model="variable.value" placeholder="e.g. bar">
+                      <span class="input-group-btn">
+                        <button class="btn btn-default" type="button" ng-click="removeEnvironmentVariable($index)">
+                          <i class="fa fa-minus" aria-hidden="true"></i>
+                        </button>
+                      </span>
+                    </div>
+                  </div>
+                </div>
+                <!-- !environment-variable-input-list -->
+              </div>
+              <!-- !environment-variables -->
+            </form>
+          </div>
+          <!-- !tab-command -->
+          <!-- tab-volume -->
+          <div class="tab-pane" id="volumes">
+            <form class="form-horizontal" style="margin-top: 15px;">
+              <!-- volumes -->
+              <div class="form-group">
+                <label for="service_volumes" class="col-sm-1 control-label text-left">Volumes</label>
+                <div class="col-sm-11">
+                  <span class="label label-default interactive" ng-click="addVolume()">
+                    <i class="fa fa-plus-circle" aria-hidden="true"></i> volume
+                  </span>
+                </div>
+                <!-- volumes-input-list -->
+                <div class="col-sm-offset-1 col-sm-11 form-inline" style="margin-top: 10px;">
+                  <div ng-repeat="volume in formValues.Volumes" style="margin-top: 2px;">
+                    <div class="input-group col-sm-1 input-group-sm">
+                      <div class="checkbox">
+                        <label>
+                          <input type="checkbox" ng-model="volume.ReadOnly"> Read-only
+                        </label>
+                      </div>
+                    </div>
+                    <div class="input-group col-sm-5 input-group-sm">
+                      <span class="input-group-addon"><input type="checkbox" ng-model="volume.Bind">bind</span>
+                      <select class="selectpicker form-control" ng-model="volume.Source" ng-if="!volume.Bind">
+                        <option selected disabled hidden value="">Select a volume</option>
+                        <option ng-repeat="vol in availableVolumes" ng-value="vol.Name">{{ vol.Name|truncate:30}}</option>
+                      </select>
+                      <input ng-if="volume.Bind" type="text" class="form-control" ng-model="volume.Source" placeholder="e.g. /path/on/host">
+                    </div>
+                    <div class="input-group col-sm-5 input-group-sm">
+                      <span class="input-group-addon">container</span>
+                      <input type="text" class="form-control" ng-model="volume.Target" placeholder="e.g. /path/in/container">
+                      <span class="input-group-btn">
+                        <button class="btn btn-default" type="button" ng-click="removeVolume($index)">
+                          <i class="fa fa-minus" aria-hidden="true"></i>
+                        </button>
+                      </span>
+                    </div>
+                  </div>
+                </div>
+                <!-- !volumes-input-list -->
+              </div>
+              <!-- !volumes -->
+            </form>
+          </div>
+          <!-- !tab-volume -->
+          <!-- tab-network -->
+          <div class="tab-pane" id="network">
+            <form class="form-horizontal" style="margin-top: 15px;">
+              <!-- network-input -->
+              <div class="form-group">
+                <label for="container_network" class="col-sm-1 control-label text-left">Network</label>
+                <div class="col-sm-9">
+                  <select class="selectpicker form-control" ng-model="formValues.Network">
+                    <option selected disabled hidden value="">Select a network</option>
+                    <option ng-repeat="net in availableNetworks" ng-value="net.Name">{{ net.Name }}</option>
+                  </select>
+                </div>
+                <div class="col-sm-2"></div>
+              </div>
+              <!-- !network-input -->
+              <!-- extra-networks -->
+              <div class="form-group">
+                <label for="service_extra_networks" class="col-sm-1 control-label text-left">Extra networks</label>
+                <div class="col-sm-11">
+                  <span class="label label-default interactive" ng-click="addExtraNetwork()">
+                    <i class="fa fa-plus-circle" aria-hidden="true"></i> network
+                  </span>
+                </div>
+                <!-- network-input-list -->
+                <div style="margin-top: 10px;">
+                  <div class="col-sm-12" ng-repeat="network in formValues.ExtraNetworks" style="margin-top: 5px;">
+                    <div class="input-group col-sm-9 input-group-sm col-sm-offset-1">
+                      <span class="input-group-btn">
+                        <button class="btn btn-default" type="button" ng-click="removeExtraNetwork($index)">
+                          <i class="fa fa-minus" aria-hidden="true"></i>
+                        </button>
+                      </span>
+                      <select class="selectpicker form-control" ng-model="network.Name">
+                        <option selected disabled hidden value="">Select a network</option>
+                        <option ng-repeat="net in availableNetworks" ng-value="net.Name">{{ net.Name }}</option>
+                      </select>
+                    </div>
+                    <div class="col-sm-2"></div>
+                  </div>
+                </div>
+                <!-- !network-input-list -->
+              </div>
+              <!-- !extra-networks -->
+            </form>
+          </div>
+          <!-- !tab-network -->
+          <!-- tab-labels -->
+          <div class="tab-pane" id="labels">
+            <form class="form-horizontal" style="margin-top: 15px;">
+              <!-- labels -->
+              <div class="form-group">
+                <label for="service_env" class="col-sm-1 control-label text-left">Labels</label>
+                <div class="col-sm-11">
+                  <span class="label label-default interactive" ng-click="addLabel()">
+                    <i class="fa fa-plus-circle" aria-hidden="true"></i> label
+                  </span>
+                </div>
+                <!-- labels-input-list -->
+                <div class="col-sm-offset-1 col-sm-11 form-inline" style="margin-top: 10px;">
+                  <div ng-repeat="label in formValues.Labels" style="margin-top: 2px;">
+                    <div class="input-group col-sm-5 input-group-sm">
+                      <span class="input-group-addon">name</span>
+                      <input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo">
+                    </div>
+                    <div class="input-group col-sm-5 input-group-sm">
+                      <span class="input-group-addon">value</span>
+                      <input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar">
+                      <span class="input-group-btn">
+                        <button class="btn btn-default" type="button" ng-click="removeLabel($index)">
+                          <i class="fa fa-minus" aria-hidden="true"></i>
+                        </button>
+                      </span>
+                    </div>
+                  </div>
+                </div>
+                <!-- !labels-input-list -->
+              </div>
+              <!-- !labels-->
+            </form>
+          </div>
+          <!-- !tab-labels -->
+
+          <!-- tab-security -->
+          <div class="tab-pane" id="security">
+          </div>
+          <!-- !tab-security -->
+        </div>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12" style="text-align: center;">
+    <div>
+      <i id="createServiceSpinner" class="fa fa-cog fa-3x fa-spin" style="margin-bottom: 5px; display: none;"></i>
+    </div>
+    <button type="button" class="btn btn-default btn-lg" ng-click="create()">Create</button>
+    <a type="button" class="btn btn-default btn-lg" ui-sref="services">Cancel</a>
+  </div>
+</div>

app/components/createVolume/createvolume.html

@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title="Create volume"></rd-header-title>
   <rd-header-content>
-    Volumes > Add volume
+    <a ui-sref="volumes">Volumes</a> > Add volume
   </rd-header-content>
 </rd-header>
 
@@ -30,7 +30,7 @@
           <div class="form-group">
             <label for="volume_driveropts" class="col-sm-1 control-label text-left">Driver options</label>
             <div class="col-sm-11">
-              <span class="label label-default clickable" ng-click="addDriverOption()">
+              <span class="label label-default interactive" ng-click="addDriverOption()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> driver option
               </span>
             </div>

app/components/dashboard/dashboard.html

@@ -6,7 +6,7 @@
 </rd-header>
 
 <div class="row">
-  <div class="col-lg-12 col-md-12 col-xs-12" ng-if="!swarm">
+  <div class="col-lg-12 col-md-12 col-xs-12" ng-if="swarm_mode || !swarm">
     <rd-widget>
       <rd-widget-header icon="fa-tachometer" title="Node info"></rd-widget-header>
       <rd-widget-body classes="no-padding">
@@ -33,7 +33,7 @@
       </rd-widget-body>
     </rd-widget>
   </div>
-  <div class="col-lg-12 col-md-12 col-xs-12" ng-if="swarm">
+  <div class="col-lg-12 col-md-12 col-xs-12" ng-if="swarm && !swarm_mode">
     <rd-widget>
       <rd-widget-header icon="fa-tachometer" title="Cluster info"></rd-widget-header>
       <rd-widget-body classes="no-padding">
@@ -41,7 +41,7 @@
           <tbody>
             <tr>
               <td>Nodes</td>
-              <td>{{ infoData.SystemStatus[3][1] }}</td>
+              <td>{{ infoData.SystemStatus[0][1] == 'primary' ? infoData.SystemStatus[3][1] : infoData.SystemStatus[4][1] }}</td>
             </tr>
             <tr>
               <td>Swarm version</td>
@@ -53,7 +53,29 @@
             </tr>
             <tr>
               <td>Total memory</td>
-              <td>{{ infoData.MemTotal|humansize }}</td>
+              <td>{{ infoData.MemTotal|humansize: 2 }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+  <div class="col-lg-12 col-md-12 col-xs-12" ng-if="swarm && swarm_mode">
+    <rd-widget>
+      <rd-widget-header icon="fa-tachometer" title="Swarm info"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr>
+              <td colspan="2"><span class="small text-muted">This node is part of a Swarm cluster</span></td>
+            </tr>
+            <tr >
+              <td>Node role</td>
+              <td>{{ infoData.Swarm.ControlAvailable ? 'Manager' : 'Worker' }}</td>
+            </tr>
+            <tr ng-if="infoData.Swarm.ControlAvailable">
+              <td>Nodes in the cluster</td>
+              <td>{{ infoData.Swarm.Nodes }}</td>
             </tr>
           </tbody>
         </table>
@@ -68,11 +90,11 @@
       <rd-widget>
         <rd-widget-body>
           <div class="widget-icon blue pull-left">
-            <i class="fa fa-tasks"></i>
+            <i class="fa fa-server"></i>
           </div>
           <div class="pull-right">
-            <div><i class="fa fa-heartbeat text-icon green-icon"></i>{{ containerData.running }} running</div>
-            <div><i class="fa fa-heartbeat text-icon red-icon"></i>{{ containerData.stopped }} stopped</div>
+            <div><i class="fa fa-heartbeat space-right green-icon"></i>{{ containerData.running }} running</div>
+            <div><i class="fa fa-heartbeat space-right red-icon"></i>{{ containerData.stopped }} stopped</div>
           </div>
           <div class="title">{{ containerData.total }}</div>
           <div class="comment">Containers</div>
@@ -88,7 +110,7 @@
             <i class="fa fa-clone"></i>
           </div>
           <div class="pull-right">
-            <div><i class="fa fa-pie-chart text-icon"></i>{{ imageData.size|humansize }}</div>
+            <div><i class="fa fa-pie-chart space-right"></i>{{ imageData.size|humansize }}</div>
           </div>
           <div class="title">{{ imageData.total }}</div>
           <div class="comment">Images</div>
@@ -104,7 +126,7 @@
             <i class="fa fa-cubes"></i>
           </div>
           <div class="pull-right" ng-if="infoData.Driver">
-            <div><i class="fa fa-hdd-o text-icon"></i>{{ infoData.Driver }} driver</div>
+            <div><i class="fa fa-hdd-o space-right"></i>{{ infoData.Driver }} driver</div>
           </div>
           <div class="title">{{ volumeData.total }}</div>
           <div class="comment">Volumes</div>

app/components/dashboard/dashboardController.js

@@ -14,6 +14,7 @@ function ($scope, $q, Config, Container, ContainerHelper, Image, Network, Volume
   $scope.volumeData = {
     total: 0
   };
+  $scope.swarm_mode = false;
 
   function prepareContainerData(d, containersToHideLabels) {
     var running = 0;
@@ -63,6 +64,9 @@ function ($scope, $q, Config, Container, ContainerHelper, Image, Network, Volume
   function prepareInfoData(d) {
     var info = d;
     $scope.infoData = info;
+    if ($scope.swarm && !_.startsWith(info.ServerVersion, 'swarm')) {
+      $scope.swarm_mode = true;
+    }
   }
 
   function fetchDashboardData(containersToHideLabels) {

app/components/dashboard/master-ctrl.js

@@ -1,5 +1,6 @@
 angular.module('dashboard')
-.controller('MasterCtrl', ['$scope', '$cookieStore', 'Settings', 'Config', function ($scope, $cookieStore, Settings, Config) {
+.controller('MasterCtrl', ['$scope', '$cookieStore', 'Settings', 'Config', 'Info',
+function ($scope, $cookieStore, Settings, Config, Info) {
   /**
   * Sidebar Toggle & Cookie Control
   */
@@ -9,7 +10,21 @@ angular.module('dashboard')
     return window.innerWidth;
   };
 
-  $scope.config = Config;
+  $scope.swarm_mode = false;
+
+  Config.$promise.then(function (c) {
+    $scope.logo = c.logo;
+    $scope.swarm = c.swarm;
+    Info.get({}, function(d) {
+      if ($scope.swarm && !_.startsWith(d.ServerVersion, 'swarm')) {
+        $scope.swarm_mode = true;
+        $scope.swarm_manager = false;
+        if (d.Swarm.ControlAvailable) {
+          $scope.swarm_manager = true;
+        }
+      }
+    });
+  });
 
   $scope.$watch($scope.getWidth, function(newValue, oldValue) {
     if (newValue >= mobileView) {

app/components/docker/docker.html

@@ -3,139 +3,113 @@
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker" ui-sref-opts="{reload: true}">
       <i class="fa fa-refresh" aria-hidden="true"></i>
     </a>
+    <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>Docker</rd-header-content>
 </rd-header>
-<div class="row">
-  <div class="col-lg-3 col-md-6 col-xs-12">
-    <rd-widget>
-      <rd-widget-body>
-        <div class="widget-icon pull-left">
-          <i class="fa fa-code"></i>
-        </div>
-        <div class="title">{{ docker.Version }}</div>
-        <div class="comment">Docker version</div>
-      </rd-widget-body>
-    </rd-widget>
-  </div>
-  <div class="col-lg-3 col-md-6 col-xs-12">
-    <rd-widget>
-      <rd-widget-body>
-        <div class="widget-icon pull-left">
-          <i class="fa fa-code"></i>
-        </div>
-        <div class="title">{{ docker.ApiVersion }}</div>
-        <div class="comment">API version</div>
-      </rd-widget-body>
-    </rd-widget>
-  </div>
-  <div class="col-lg-3 col-md-6 col-xs-12">
-    <rd-widget>
-      <rd-widget-body>
-        <div class="widget-icon pull-left">
-          <i class="fa fa-code"></i>
-        </div>
-        <div class="title">{{ docker.GoVersion }}</div>
-        <div class="comment">Go version</div>
-      </rd-widget-body>
-    </rd-widget>
-  </div>
-</div>
 
-<div class="row">
-  <div class="col-lg-12">
+<div class="row" ng-if="state.loaded">
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Engine status"></rd-widget-header>
+      <rd-widget-header icon="fa-code" title="Engine version"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
             <tr>
-              <td>Containers</td>
-              <td>{{ info.Containers }}</td>
+              <td>Version</td>
+              <td>{{ version.Version }}</td>
             </tr>
             <tr>
-              <td>Images</td>
-              <td>{{ info.Images }}</td>
+              <td>API version</td>
+              <td>{{ version.ApiVersion }}</td>
             </tr>
             <tr>
-              <td>Debug</td>
-              <td>{{ info.Debug }}</td>
+              <td>Go version</td>
+              <td>{{ version.GoVersion }}</td>
             </tr>
             <tr>
-              <td>CPUs</td>
-              <td>{{ info.NCPU }}</td>
+              <td>OS type</td>
+              <td>{{ version.Os }}</td>
             </tr>
             <tr>
-              <td>Total Memory</td>
-              <td>{{ info.MemTotal|humansize }}</td>
-            </tr>
-            <tr>
-              <td>Operating System</td>
+              <td>OS</td>
               <td>{{ info.OperatingSystem }}</td>
             </tr>
             <tr>
-              <td>Kernel Version</td>
-              <td>{{ info.KernelVersion }}</td>
+              <td>Architecture</td>
+              <td>{{ version.Arch }}</td>
             </tr>
             <tr>
-              <td>ID</td>
-              <td>{{ info.ID }}</td>
-            </tr>
-            <tr>
-              <td>Labels</td>
-              <td>{{ info.Labels }}</td>
-            </tr>
-            <tr>
-              <td>File Descriptors</td>
-              <td>{{ info.NFd }}</td>
-            </tr>
-            <tr>
-              <td>Goroutines</td>
-              <td>{{ info.NGoroutines }}</td>
-            </tr>
-            <tr>
-              <td>Storage Driver</td>
-              <td>{{ info.Driver }}</td>
-            </tr>
-            <tr>
-              <td>Storage Driver Status</td>
-              <td>
-                <p ng-repeat="val in info.DriverStatus">
-                  {{ val[0] }}: {{ val[1] }}
-                </p>
-              </td>
-            </tr>
-            <tr>
-              <td>Execution Driver</td>
-              <td>{{ info.ExecutionDriver }}</td>
-            </tr>
-            <tr>
-              <td>IPv4 Forwarding</td>
-              <td>{{ info.IPv4Forwarding }}</td>
-            </tr>
-            <tr>
-              <td>Index Server Address</td>
-              <td>{{ info.IndexServerAddress }}</td>
-            </tr>
-            <tr>
-              <td>Init Path</td>
-              <td>{{ info.InitPath }}</td>
-            </tr>
-            <tr>
-              <td>Docker Root Directory</td>
-              <td>{{ info.DockerRootDir }}</td>
-            </tr>
-            <tr>
-              <td>Init SHA1</td>
-              <td>{{ info.InitSha1 }}</td>
-            </tr>
-            <tr>
-              <td>Memory Limit</td>
-              <td>{{ info.MemoryLimit }}</td>
-            </tr>
-            <tr>
-              <td>Swap Limit</td>
-              <td>{{ info.SwapLimit }}</td>
+              <td>Kernel version</td>
+              <td>{{ version.KernelVersion }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row" ng-if="state.loaded">
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-th" title="Engine status"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr>
+              <td>Total CPU</td>
+              <td>{{ info.NCPU }}</td>
+            </tr>
+            <tr>
+              <td>Total memory</td>
+              <td>{{ info.MemTotal|humansize }}</td>
+            </tr>
+            <tr>
+              <td>Docker root directory</td>
+              <td>{{ info.DockerRootDir }}</td>
+            </tr>
+            <tr>
+              <td>Storage driver</td>
+              <td>{{ info.Driver }}</td>
+            </tr>
+            <tr>
+              <td>Logging driver</td>
+              <td>{{ info.LoggingDriver }}</td>
+            </tr>
+            <tr ng-if="info.CgroupDriver">
+              <td>Cgroup driver</td>
+              <td>{{ info.CgroupDriver }}</td>
+            </tr>
+            <tr ng-if="info.ExecutionDriver">
+              <td>Execution driver</td>
+              <td>{{ info.ExecutionDriver }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row" ng-if="state.loaded && info.Plugins">
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-plug" title="Engine plugins"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr ng-if="info.Plugins.Volume">
+              <td>Volume</td>
+              <td>{{ info.Plugins.Volume|arraytostr: ', '}}</td>
+            </tr>
+            <tr ng-if="info.Plugins.Network">
+              <td>Network</td>
+              <td>{{ info.Plugins.Network|arraytostr: ', '}}</td>
+            </tr>
+            <tr ng-if="info.Plugins.Authorization">
+              <td>Authorization</td>
+              <td>{{ info.Plugins.Authorization|arraytostr: ', '}}</td>
             </tr>
           </tbody>
         </table>

app/components/docker/dockerController.js

@@ -1,19 +1,24 @@
 angular.module('docker', [])
-.controller('DockerController', ['$scope', 'Info', 'Version', 'Settings',
-function ($scope, Info, Version, Settings) {
-
-  $scope.info = {};
-  $scope.docker = {};
-  
-  $scope.order = function(sortType) {
-    $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
-    $scope.sortType = sortType;
+.controller('DockerController', ['$scope', 'Info', 'Version', 'Messages',
+function ($scope, Info, Version, Messages) {
+  $scope.state = {
+    loaded: false
   };
+  $scope.info = {};
+  $scope.version = {};
 
-  Version.get({}, function (d) {
-    $scope.docker = d;
-  });
-  Info.get({}, function (d) {
-    $scope.info = d;
+  Info.get({}, function (infoData) {
+    $scope.info = infoData;
+    Version.get({}, function (versionData) {
+      $scope.version = versionData;
+      $scope.state.loaded = true;
+      $('#loadingViewSpinner').hide();
+    }, function (e) {
+      Messages.error("Failure", e, 'Unable to retrieve engine details');
+      $('#loadingViewSpinner').hide();
+    });
+  }, function (e) {
+    Messages.error("Failure", e, 'Unable to retrieve engine information');
+    $('#loadingViewSpinner').hide();
   });
 }]);

app/components/image/image.html

@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    Images > <a ui-sref="image({id: image.Id})">{{ image.Id }}</a>
+    <a ui-sref="images">Images</a> > <a ui-sref="image({id: image.Id})">{{ image.Id }}</a>
   </rd-header-content>
 </rd-header>
 
@@ -13,7 +13,7 @@
       <rd-widget-header icon="fa fa-tags" title="Image tags"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <div style="margin: 5px 10px;">
-          <span ng-repeat="tag in RepoTags" class="label label-primary image-tag">
+          <span ng-repeat="tag in RepoTags" class="label label-primary image-tag space-right">
             <a data-toggle="tooltip" class="interactive" title="Push to registry" ng-click="pushImage(tag)">
               <i class="fa fa-upload white-icon" aria-hidden="true"></i>
             </a>
@@ -82,7 +82,7 @@
               <td>ID</td>
               <td>
                 {{ image.Id }}
-                <button class="btn btn-xs btn-danger" ng-click="removeImage(image.Id)">Delete this image</button>
+                <button class="btn btn-xs btn-danger" ng-click="removeImage(image.Id)"><i class="fa fa-trash space-right" aria-hidden="true"></i>Delete this image</button>
               </td>
             </tr>
             <tr ng-if="image.Parent">
@@ -130,7 +130,7 @@
             <tr ng-if="image.ContainerConfig.ExposedPorts">
               <td>EXPOSE</td>
               <td>
-                <span class="label label-default tag" ng-repeat="port in exposedPorts">
+                <span class="label label-default space-right" ng-repeat="port in exposedPorts">
                   {{ port }}
                 </span>
               </td>
@@ -138,7 +138,7 @@
             <tr ng-if="image.ContainerConfig.Volumes">
               <td>VOLUME</td>
               <td>
-                <span class="label label-default tag" ng-repeat="volume in volumes">
+                <span class="label label-default space-right" ng-repeat="volume in volumes">
                   {{ volume }}
                 </span>
               </td>

app/components/images/images.html

@@ -55,7 +55,7 @@
       </rd-widget-header>
       <rd-widget-taskbar classes="col-lg-12">
         <div class="pull-left">
-          <button type="button" class="btn btn-danger" ng-click="removeAction()" ng-disabled="!state.selectedItemCount">Remove</button>
+          <button type="button" class="btn btn-danger" ng-click="removeAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button>
         </div>
         <div class="pull-right">
           <input type="text" id="filter" ng-model="state.filter" placeholder="Filter..." class="form-control input-sm" />
@@ -107,6 +107,12 @@
                 <td>{{ image.VirtualSize|humansize }}</td>
                 <td>{{ image.Created|getisodatefromtimestamp }}</td>
               </tr>
+              <tr ng-if="!images">
+                <td colspan="5" class="text-center text-muted">Loading...</td>
+              </tr>
+              <tr ng-if="images.length == 0">
+                <td colspan="5" class="text-center text-muted">No images available.</td>
+              </tr>
             </tbody>
           </table>
         </div>

app/components/images/imagesController.js

@@ -72,7 +72,7 @@ function ($scope, $state, Config, Image, Messages) {
         counter = counter + 1;
         Image.remove({id: i.Id}, function (d) {
           if (d[0].message) {
-            $('#loadingViewSpinner').hide();
+            $('#loadImagesSpinner').hide();
             Messages.error("Unable to remove image", {}, d[0].message);
           } else {
             Messages.send("Image deleted", i.Id);
@@ -97,11 +97,11 @@ function ($scope, $state, Config, Image, Messages) {
     }, function (e) {
       $('#loadImagesSpinner').hide();
       Messages.error("Failure", e, "Unable to retrieve images");
+      $scope.images = [];
     });
   }
 
   Config.$promise.then(function (c) {
-    $scope.availableRegistries = c.registries;
     fetchImages();
   });
 }]);

app/components/network/network.html

@@ -3,123 +3,61 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    Networks > <a ui-sref="network({id: network.Id})">{{ network.Name }}</a>
+    <a ui-sref="networks">Networks</a> > <a ui-sref="network({id: network.Id})">{{ network.Name }}</a>
   </rd-header-content>
 </rd-header>
 
 <div class="row">
-  <div class="col-lg-9 col-md-9 col-xs-9">
-    <rd-widget>
-      <rd-widget-body>
-        <div class="widget-icon grey pull-left">
-          <i class="fa fa-sitemap"></i>
-        </div>
-        <div class="title">{{ network.Name }}</div>
-        <div class="comment">Name</div>
-      </rd-widget-body>
-    </rd-widget>
-  </div>
-  <div class="col-lg-3 col-md-3 col-xs-3">
-    <rd-widget>
-      <rd-widget-body>
-        <div class="widget-icon grey pull-left">
-          <i class="fa fa-cogs"></i>
-        </div>
-        <div class="title">
-          <div class="btn-group" role="group" aria-label="...">
-            <button class="btn btn-default" disabled>Connect container...</button>
-            <button class="btn btn-danger" ng-click="remove(id)">Remove</button>
-          </div>
-        </div>
-        <div class="comment">
-          Actions
-        </div>
-      </rd-widget-body>
-    </rd-widget>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-12">
+  <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
       <rd-widget-header icon="fa-sitemap" title="Network details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
             <tr>
-              <td>Id</td>
-              <td>{{ network.Id }}</td>
+              <td>Name</td>
+              <td>{{ network.Name }}</td>
             </tr>
             <tr>
-              <td>Scope</td>
-              <td>{{ network.Scope }}</td>
+              <td>ID</td>
+              <td>
+                {{ network.Id }}
+                <button class="btn btn-xs btn-danger" ng-click="removeNetwork(network.Id)"><i class="fa fa-trash space-right" aria-hidden="true"></i>Delete this network</button>
+              </td>
             </tr>
             <tr>
               <td>Driver</td>
               <td>{{ network.Driver }}</td>
             </tr>
             <tr>
-              <td>IPAM</td>
-              <td>
-                <table class="table table-striped">
-                  <tr>
-                    <td>Driver</td>
-                    <td>{{ network.IPAM.Driver }}</td>
-                  </tr>
-                  <tr>
-                    <td>Subnet</td>
-                    <td>{{ network.IPAM.Config[0].Subnet }}</td>
-                  </tr>
-                  <tr>
-                    <td>Gateway</td>
-                    <td>{{ network.IPAM.Config[0].Gateway }}</td>
-                  </tr>
-                </table>
-              </td>
+              <td>Scope</td>
+              <td>{{ network.Scope }}</td>
             </tr>
-            <tr>
-              <td>Containers</td>
-              <td>
-                <table class="table table-striped" ng-repeat="(Id, container) in network.Containers">
-                  <tr>
-                    <td>Id</td>
-                    <td><a ui-sref="container({id: Id})">{{ Id }}</a></td>
-                  </tr>
-                  <tr>
-                    <td>EndpointID</td>
-                    <td>{{ container.EndpointID}}</td>
-                  </tr>
-                  <tr>
-                    <td>MacAddress</td>
-                    <td>{{ container.MacAddress}}</td>
-                  </tr>
-                  <tr>
-                    <td>IPv4Address</td>
-                    <td>{{ container.IPv4Address}}</td>
-                  </tr>
-                  <tr>
-                    <td>IPv6Address</td>
-                    <td>{{ container.IPv6Address}}</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      <button ng-click="disconnect(network.Id, Id)" class="btn btn-danger">
-                        Disconnect from network
-                      </button>
-                    </td>
-                  </tr>
-                </table>
-              </td>
+            <tr ng-if="network.IPAM.Config[0].Subnet">
+              <td>Subnet</td>
+              <td>{{ network.IPAM.Config[0].Subnet }}</td>
             </tr>
-            <tr>
-              <td>Options</td>
-              <td>
-                <table role="table" class="table table-striped">
-                  <tr ng-repeat="(k, v) in network.Options">
-                    <td>{{ k }}</td>
-                    <td>{{ v }}</td>
-                  </tr>
-                </table>
-              </td>
+            <tr ng-if="network.IPAM.Config[0].Gateway">
+              <td>Gateway</td>
+              <td>{{ network.IPAM.Config[0].Gateway }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row" ng-if="!(network.Options | emptyobject)">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-cogs" title="Network options"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr ng-repeat="(key, value) in network.Options">
+              <td>{{ key }}</td>
+              <td>{{ value }}</td>
             </tr>
           </tbody>
         </table>

app/components/network/networkController.js

@@ -1,20 +1,8 @@
 angular.module('network', [])
-.controller('NetworkController', ['$scope', 'Network', 'Messages', '$state', '$stateParams',
-function ($scope, Network, Messages, $state, $stateParams) {
+.controller('NetworkController', ['$scope', '$state', '$stateParams', 'Network', 'Messages',
+function ($scope, $state, $stateParams, Network, Messages) {
 
-  $scope.disconnect = function disconnect(networkId, containerId) {
-    $('#loadingViewSpinner').show();
-    Network.disconnect({id: $stateParams.id}, {Container: containerId}, function (d) {
-      $('#loadingViewSpinner').hide();
-      Messages.send("Container disconnected", containerId);
-      $state.go('network', {id: $stateParams.id}, {reload: true});
-    }, function (e) {
-      $('#loadingViewSpinner').hide();
-      Messages.error("Failure", e, "Unable to disconnect container");
-    });
-  };
-
-  $scope.remove = function remove(networkId) {
+  $scope.removeNetwork = function removeNetwork(networkId) {
     $('#loadingViewSpinner').show();
     Network.remove({id: $stateParams.id}, function (d) {
       if (d.message) {

app/components/networks/networks.html

@@ -7,93 +7,140 @@
   <rd-header-content>Networks</rd-header-content>
 </rd-header>
 
-<div class="col-lg-12">
-  <rd-widget>
-    <rd-widget-header icon="fa-sitemap" title="Networks">
-      <div class="pull-right">
-        <i id="loadNetworksSpinner" class="fa fa-cog fa-2x fa-spin" style="margin-top: 5px;"></i>
-      </div>
-    </rd-widget-header>
-    <rd-widget-taskbar classes="col-lg-12">
-      <div class="pull-left">
-        <button type="button" class="btn btn-danger" ng-click="removeAction()" ng-disabled="!state.selectedItemCount">Remove</button>
-        <a class="btn btn-default" type="button" ui-sref="actions.create.network">Add network</a>
-      </div>
-      <div class="pull-right">
-        <input type="text" id="filter" ng-model="state.filter" placeholder="Filter..." class="form-control input-sm" />
-      </div>
-    </rd-widget-taskbar>
-    <rd-widget-body classes="no-padding">
-      <div class="table-responsive">
-        <table class="table table-hover">
-          <thead>
-            <tr>
-              <th></th>
-              <th>
-                <a ui-sref="networks" ng-click="order('Name')">
-                  Name
-                  <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ui-sref="networks" ng-click="order('Id')">
-                  Id
-                  <span ng-show="sortType == 'Id' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'Id' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ui-sref="networks" ng-click="order('Scope')">
-                  Scope
-                  <span ng-show="sortType == 'Scope' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'Scope' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ui-sref="networks" ng-click="order('Driver')">
-                  Driver
-                  <span ng-show="sortType == 'Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ui-sref="networks" ng-click="order('IPAM.Driver')">
-                  IPAM Driver
-                  <span ng-show="sortType == 'IPAM.Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'IPAM.Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ui-sref="networks" ng-click="order('IPAM.Config[0].Subnet')">
-                  IPAM Subnet
-                  <span ng-show="sortType == 'IPAM.Config[0].Subnet' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'IPAM.Config[0].Subnet' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ui-sref="networks" ng-click="order('IPAM.Config[0].Gateway')">
-                  IPAM Gateway
-                  <span ng-show="sortType == 'IPAM.Config[0].Gateway' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'IPAM.Config[0].Gateway' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
-                </a>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr ng-repeat="network in ( state.filteredNetworks = (networks | filter:state.filter | orderBy:sortType:sortReverse))">
-              <td><input type="checkbox" ng-model="network.Checked" ng-change="selectItem(network)"/></td>
-              <td><a ui-sref="network({id: network.Id})">{{ network.Name|truncate:40}}</a></td>
-              <td>{{ network.Id }}</td>
-              <td>{{ network.Scope }}</td>
-              <td>{{ network.Driver }}</td>
-              <td>{{ network.IPAM.Driver }}</td>
-              <td>{{ network.IPAM.Config[0].Subnet ? network.IPAM.Config[0].Subnet : '-' }}</td>
-              <td>{{ network.IPAM.Config[0].Gateway ? network.IPAM.Config[0].Gateway : '-' }}</td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </rd-widget-body>
-  <rd-widget>
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-plus" title="Add a network">
+      </rd-widget-header>
+      <rd-widget-body>
+        <form class="form-horizontal">
+          <!-- name-input -->
+          <div class="form-group">
+            <label for="network_name" class="col-sm-1 control-label text-left">Name</label>
+            <div class="col-sm-11">
+              <input type="text" class="form-control" ng-model="config.Name" id="network_name" placeholder="e.g. myNetwork">
+            </div>
+          </div>
+          <!-- !name-input -->
+          <!-- tag-note -->
+          <div class="form-group" ng-if="swarm">
+            <div class="col-sm-12">
+              <span class="small text-muted">Note: The network will be created using the overlay driver and will allow containers to communicate across the hosts of your cluster.</span>
+            </div>
+          </div>
+          <div class="form-group" ng-if="!swarm">
+            <div class="col-sm-12">
+              <span class="small text-muted">Note: The network will be created using the bridge driver.</span>
+            </div>
+          </div>
+          <!-- !tag-note -->
+          <div class="form-group">
+            <div class="col-sm-12">
+              <button type="button" class="btn btn-default btn-sm" ng-disabled="!config.Name" ng-click="createNetwork()">Create</button>
+              <button type="button" class="btn btn-default btn-sm" ui-sref="actions.create.network">Advanced settings...</button>
+              <i id="createNetworkSpinner" class="fa fa-cog fa-spin" style="margin-left: 5px; display: none;"></i>
+            </div>
+          </div>
+        </form>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-sitemap" title="Networks">
+        <div class="pull-right">
+          <i id="loadNetworksSpinner" class="fa fa-cog fa-2x fa-spin" style="margin-top: 5px;"></i>
+        </div>
+      </rd-widget-header>
+      <rd-widget-taskbar classes="col-lg-12">
+        <div class="pull-left">
+          <button type="button" class="btn btn-danger" ng-click="removeAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button>
+        </div>
+        <div class="pull-right">
+          <input type="text" id="filter" ng-model="state.filter" placeholder="Filter..." class="form-control input-sm" />
+        </div>
+      </rd-widget-taskbar>
+      <rd-widget-body classes="no-padding">
+        <div class="table-responsive">
+          <table class="table table-hover">
+            <thead>
+              <tr>
+                <th></th>
+                <th>
+                  <a ui-sref="networks" ng-click="order('Name')">
+                    Name
+                    <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                    <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  </a>
+                </th>
+                <th>
+                  <a ui-sref="networks" ng-click="order('Id')">
+                    Id
+                    <span ng-show="sortType == 'Id' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                    <span ng-show="sortType == 'Id' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  </a>
+                </th>
+                <th>
+                  <a ui-sref="networks" ng-click="order('Scope')">
+                    Scope
+                    <span ng-show="sortType == 'Scope' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                    <span ng-show="sortType == 'Scope' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  </a>
+                </th>
+                <th>
+                  <a ui-sref="networks" ng-click="order('Driver')">
+                    Driver
+                    <span ng-show="sortType == 'Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                    <span ng-show="sortType == 'Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  </a>
+                </th>
+                <th>
+                  <a ui-sref="networks" ng-click="order('IPAM.Driver')">
+                    IPAM Driver
+                    <span ng-show="sortType == 'IPAM.Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                    <span ng-show="sortType == 'IPAM.Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  </a>
+                </th>
+                <th>
+                  <a ui-sref="networks" ng-click="order('IPAM.Config[0].Subnet')">
+                    IPAM Subnet
+                    <span ng-show="sortType == 'IPAM.Config[0].Subnet' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                    <span ng-show="sortType == 'IPAM.Config[0].Subnet' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  </a>
+                </th>
+                <th>
+                  <a ui-sref="networks" ng-click="order('IPAM.Config[0].Gateway')">
+                    IPAM Gateway
+                    <span ng-show="sortType == 'IPAM.Config[0].Gateway' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                    <span ng-show="sortType == 'IPAM.Config[0].Gateway' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  </a>
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr ng-repeat="network in ( state.filteredNetworks = (networks | filter:state.filter | orderBy:sortType:sortReverse))">
+                <td><input type="checkbox" ng-model="network.Checked" ng-change="selectItem(network)"/></td>
+                <td><a ui-sref="network({id: network.Id})">{{ network.Name|truncate:40}}</a></td>
+                <td>{{ network.Id }}</td>
+                <td>{{ network.Scope }}</td>
+                <td>{{ network.Driver }}</td>
+                <td>{{ network.IPAM.Driver }}</td>
+                <td>{{ network.IPAM.Config[0].Subnet ? network.IPAM.Config[0].Subnet : '-' }}</td>
+                <td>{{ network.IPAM.Config[0].Gateway ? network.IPAM.Config[0].Gateway : '-' }}</td>
+              </tr>
+              <tr ng-if="!networks">
+                <td colspan="8" class="text-center text-muted">Loading...</td>
+              </tr>
+              <tr ng-if="networks.length == 0">
+                <td colspan="8" class="text-center text-muted">No networks available.</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </rd-widget-body>
+    <rd-widget>
+  </div>
 </div>

app/components/networks/networksController.js

@@ -6,17 +6,39 @@ function ($scope, $state, Network, Config, Messages) {
   $scope.state.advancedSettings = false;
   $scope.sortType = 'Name';
   $scope.sortReverse = false;
-
-  $scope.formValues = {
-    Subnet: '',
-    Gateway: ''
+  $scope.config = {
+    Name: ''
   };
 
-  $scope.config = {
-    Name: '',
-    IPAM: {
-      Config: []
+  function prepareNetworkConfiguration() {
+    var config = angular.copy($scope.config);
+    if ($scope.swarm) {
+      config.Driver = 'overlay';
+      // Force IPAM Driver to 'default', should not be required.
+      // See: https://github.com/docker/docker/issues/25735
+      config.IPAM = {
+        Driver: 'default'
+      };
     }
+    return config;
+  }
+
+  $scope.createNetwork = function() {
+    $('#createNetworkSpinner').show();
+    var config = prepareNetworkConfiguration();
+    Network.create(config, function (d) {
+      if (d.message) {
+        $('#createNetworkSpinner').hide();
+        Messages.error('Unable to create network', {}, d.message);
+      } else {
+        Messages.send("Network created", d.Id);
+        $('#createNetworkSpinner').hide();
+        $state.go('networks', {}, {reload: true});
+      }
+    }, function (e) {
+      $('#createNetworkSpinner').hide();
+      Messages.error("Failure", e, 'Unable to create network');
+    });
   };
 
   $scope.order = function(sortType) {
@@ -69,8 +91,12 @@ function ($scope, $state, Network, Config, Messages) {
     }, function (e) {
       $('#loadNetworksSpinner').hide();
       Messages.error("Failure", e, "Unable to retrieve networks");
+      $scope.networks = [];
     });
   }
 
-  fetchNetworks();
+  Config.$promise.then(function (c) {
+    $scope.swarm = c.swarm;
+    fetchNetworks();
+  });
 }]);

app/components/service/service.html

@@ -0,0 +1,205 @@
+<rd-header>
+  <rd-header-title title="Service details">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="service({id: service.Id})" ui-sref-opts="{reload: true}">
+      <i class="fa fa-refresh" aria-hidden="true"></i>
+    </a>
+    <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
+  </rd-header-title>
+  <rd-header-content>
+    <a ui-sref="services">Services</a> > <a ui-sref="service({id: service.Id})">{{ service.Name }}</a>
+  </rd-header-content>
+</rd-header>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-list-alt" title="Service details"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr>
+              <td>Name</td>
+              <td ng-if="!service.EditName">
+                {{ service.Name }}
+                <a href="" data-toggle="tooltip" title="Edit service name" ng-click="service.EditName = true;"><i class="fa fa-edit"></i></a>
+              </td>
+              <td ng-if="service.EditName">
+                <input type="text" class="containerNameInput" ng-model="service.newServiceName">
+                <a class="interactive" ng-click="service.EditName = false;"><i class="fa fa-times"></i></a>
+                <a class="interactive" ng-click="renameService(service)"><i class="fa fa-check-square-o"></i></a>
+              </td>
+            </tr>
+            <tr>
+              <td>ID</td>
+              <td>
+                {{ service.Id }}
+                <button class="btn btn-xs btn-danger" ng-click="removeService()"><i class="fa fa-trash space-right" aria-hidden="true"></i>Delete this service</button>
+              </td>
+            </tr>
+            <tr>
+              <td>Scheduling mode</td>
+              <td>{{ service.Mode }}</td>
+            </tr>
+            <tr ng-if="service.Mode === 'replicated'">
+              <td>Replicas</td>
+              <td>
+                <span ng-if="service.Mode === 'replicated' && !service.EditReplicas">
+                  {{ service.Replicas }}
+                  <a class="interactive" ng-click="service.EditReplicas = true;"><i class="fa fa-arrows-v" aria-hidden="true"></i> Scale</a>
+                </span>
+                <span ng-if="service.Mode === 'replicated' && service.EditReplicas">
+                  <input class="input-sm" type="number" ng-model="service.newServiceReplicas" />
+                  <a class="interactive" ng-click="service.EditReplicas = false;"><i class="fa fa-times"></i></a>
+                  <a class="interactive" ng-click="scaleService(service)"><i class="fa fa-check-square-o"></i></a>
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <td>Image</td>
+              <td ng-if="!service.EditImage">
+                {{ service.Image }}
+                <a href="" data-toggle="tooltip" title="Edit service image" ng-click="service.EditImage = true;"><i class="fa fa-edit"></i></a>
+              </td>
+
+              <td ng-if="service.EditImage">
+                <input type="text" class="containerNameInput" ng-model="service.newServiceImage">
+                <a class="interactive" ng-click="service.EditImage = false;"><i class="fa fa-times"></i></a>
+                <a class="interactive" ng-click="changeServiceImage(service)"><i class="fa fa-check-square-o"></i></a>
+              </td>
+            </tr>
+            <tr ng-if="service.Ports">
+              <td>Published ports</td>
+              <td>
+                <div ng-repeat="mapping in service.Ports">
+                  {{ mapping.TargetPort }} <i class="fa fa-long-arrow-right"></i> {{ mapping.PublishedPort }}
+                </div>
+              </td>
+            </tr>
+            <tr ng-if="service.EnvironmentVariables">
+              <td>Environment variables</td>
+              <td>
+                <div class="form-group">
+                  <div class="col-sm-11 nopadding">
+                    <span class="label label-default interactive fit-text-size" ng-click="addEnvironmentVariable(service)">
+                      <i class="fa fa-plus-circle" aria-hidden="true"></i> environment variable
+                    </span>
+                  </div>
+                  <!-- environment-variable-input-list -->
+                  <div class="col-sm-11 form-inline nopadding" style="margin-top: 10px;">
+                    <div ng-repeat="var in service.EnvironmentVariables" style="margin-top: 2px;">
+                      <div class="input-group col-sm-5 input-group-sm">
+                        <span class="input-group-addon fit-text-size">name</span>
+                        <input type="text" class="form-control" ng-model="var.key" ng-disabled="var.added" placeholder="e.g. FOO">
+                      </div>
+                      <div class="input-group col-sm-5 input-group-sm">
+                        <span class="input-group-addon fit-text-size">value</span>
+                        <input type="text" class="form-control" ng-model="var.value" ng-change="updateEnvironmentVariable(service, var)" placeholder="e.g. bar">
+                        <span class="input-group-btn">
+                          <button class="btn btn-default" type="button" ng-click="removeEnvironmentVariable(service, $index)">
+                            <i class="fa fa-minus" aria-hidden="true"></i>
+                          </button>
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                  <!-- !environment-variable-input-list -->
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td>Labels</td>
+              <td>
+                <div class="form-group">
+                  <div class="col-sm-11 nopadding">
+                    <span class="label label-default interactive fit-text-size" ng-click="addLabel(service)">
+                      <i class="fa fa-plus-circle" aria-hidden="true"></i> label
+                    </span>
+                  </div>
+                  <!-- labels-input-list -->
+                  <div class="col-sm-11 form-inline nopadding" style="margin-top: 10px;">
+                    <div ng-repeat="label in service.ServiceLabels" style="margin-top: 2px;">
+                      <div class="input-group col-sm-5 input-group-sm">
+                        <span class="input-group-addon fit-text-size">name</span>
+                        <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" ng-change="updateLabel(service, label)">
+                      </div>
+                      <div class="input-group col-sm-5 input-group-sm">
+                        <span class="input-group-addon fit-text-size">value</span>
+                        <input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" ng-change="updateLabel(service, label)">
+                        <span class="input-group-btn">
+                          <button class="btn btn-default" type="button" ng-click="removeLabel(service, $index)">
+                            <i class="fa fa-minus" aria-hidden="true"></i>
+                          </button>
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                  <!-- !labels-input-list -->
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+      <rd-widget-footer ng-if="service.hasChanges">
+        <div>
+            <button type="button" class="btn btn-primary" ng-click="updateService(service)">Save changes</button>
+            <button type="button" class="btn btn-default" ng-click="cancelChanges(service)">Reset</button>
+        </div>
+      </rd-widget-footer>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row" ng-if="tasks.length > 0">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-tasks" title="Associated tasks"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <thead>
+            <tr>
+              <th>Id</th>
+              <th>
+                <a ui-sref="service" ng-click="order('Status')">
+                  Status
+                  <span ng-show="sortType == 'Status' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Status' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="service" ng-click="order('Slot')">
+                  Slot
+                  <span ng-show="sortType == 'Slot' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Slot' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th ng-if="displayNode">
+                <a ui-sref="service" ng-click="order('Node')">
+                  Node
+                  <span ng-show="sortType == 'Node' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Node' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="service" ng-click="order('Updated')">
+                  Last update
+                  <span ng-show="sortType == 'Updated' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Updated' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr ng-repeat="task in (filteredTasks = ( tasks | orderBy:sortType:sortReverse))">
+              <td><a ui-sref="task({ id: task.Id })">{{ task.Id }}</a></td>
+              <td><span class="label label-{{ task.Status|taskstatusbadge }}">{{ task.Status }}</span></td>
+              <td>{{ task.Slot }}</td>
+              <td ng-if="displayNode">{{ task.Node }}</td>
+              <td>{{ task.Updated|getisodate }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>

app/components/service/serviceController.js

@@ -0,0 +1,196 @@
+angular.module('service', [])
+.controller('ServiceController', ['$scope', '$stateParams', '$state', 'Service', 'ServiceHelper', 'Task', 'Node', 'Messages',
+function ($scope, $stateParams, $state, Service, ServiceHelper, Task, Node, Messages) {
+
+  $scope.service = {};
+  $scope.tasks = [];
+  $scope.displayNode = false;
+  $scope.sortType = 'Status';
+  $scope.sortReverse = false;
+
+  var previousServiceValues = {};
+
+  $scope.order = function (sortType) {
+    $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
+    $scope.sortType = sortType;
+  };
+
+  $scope.renameService = function renameService(service) {
+    updateServiceAttribute(service, 'Name', service.newServiceName || service.name);
+    service.EditName = false;
+  };
+  $scope.changeServiceImage = function changeServiceImage(service) {
+    updateServiceAttribute(service, 'Image', service.newServiceImage || service.image);
+    service.EditImage = false;
+  };
+  $scope.scaleService = function scaleService(service) {
+    updateServiceAttribute(service, 'Replicas', service.newServiceReplicas || service.Replicas);
+    service.EditReplicas = false;
+  };
+
+  $scope.addEnvironmentVariable = function addEnvironmentVariable(service) {
+    service.EnvironmentVariables.push({ key: '', value: '', originalValue: '' });
+    service.hasChanges = true;
+  };
+  $scope.removeEnvironmentVariable = function removeEnvironmentVariable(service, index) {
+    var removedElement = service.EnvironmentVariables.splice(index, 1);
+    service.hasChanges = service.hasChanges || removedElement !== null;
+  };
+  $scope.updateEnvironmentVariable = function updateEnvironmentVariable(service, variable) {
+    service.hasChanges = service.hasChanges || variable.value !== variable.originalValue;
+  };
+  $scope.addLabel = function addLabel(service) {
+    service.hasChanges = true;
+    service.ServiceLabels.push({ key: '', value: '', originalValue: '' });
+  };
+  $scope.removeLabel = function removeLabel(service, index) {
+    var removedElement = service.ServiceLabels.splice(index, 1);
+    service.hasChanges = service.hasChanges || removedElement !== null;
+  };
+  $scope.updateLabel = function updateLabel(service, label) {
+    service.hasChanges = service.hasChanges || label.value !== label.originalValue;
+  };
+
+  $scope.cancelChanges = function changeServiceImage(service) {
+    Object.keys(previousServiceValues).forEach(function(attribute) {
+      service[attribute] = previousServiceValues[attribute]; // reset service values
+      service['newService' + attribute] = previousServiceValues[attribute]; // reset edit fields
+    });
+    previousServiceValues = {}; // clear out all changes
+    // clear out environment variable changes
+    service.EnvironmentVariables = translateEnvironmentVariables(service.Env);
+    service.ServiceLabels = translateLabelsToServiceLabels(service.Labels);
+
+    service.hasChanges = false;
+  };
+
+  $scope.updateService = function updateService(service) {
+    $('#loadServicesSpinner').show();
+    var config = ServiceHelper.serviceToConfig(service.Model);
+    config.Name = service.newServiceName;
+    config.TaskTemplate.ContainerSpec.Env = translateEnvironmentVariablesToEnv(service.EnvironmentVariables);
+    config.TaskTemplate.ContainerSpec.Labels = translateServiceLabelsToLabels(service.ServiceLabels);
+    config.TaskTemplate.ContainerSpec.Image = service.newServiceImage;
+    if (service.Mode === 'replicated') {
+      config.Mode.Replicated.Replicas = service.Replicas;
+    }
+
+    Service.update({ id: service.Id, version: service.Version }, config, function (data) {
+      $('#loadServicesSpinner').hide();
+      Messages.send("Service successfully updated", "Service updated");
+      $state.go('service', {id: service.Id}, {reload: true});
+    }, function (e) {
+      $('#loadServicesSpinner').hide();
+      Messages.error("Failure", e, "Unable to update service");
+    });
+  };
+
+
+  $scope.removeService = function removeService() {
+    $('#loadingViewSpinner').show();
+    Service.remove({id: $stateParams.id}, function (d) {
+      if (d.message) {
+        $('#loadingViewSpinner').hide();
+        Messages.send("Error", {}, d.message);
+      } else {
+        $('#loadingViewSpinner').hide();
+        Messages.send("Service removed", $stateParams.id);
+        $state.go('services', {});
+      }
+    }, function (e) {
+      $('#loadingViewSpinner').hide();
+      Messages.error("Failure", e, "Unable to remove service");
+    });
+  };
+
+  function fetchServiceDetails() {
+    $('#loadingViewSpinner').show();
+    Service.get({id: $stateParams.id}, function (d) {
+      var service = new ServiceViewModel(d);
+      service.newServiceName = service.Name;
+      service.newServiceImage = service.Image;
+      service.newServiceReplicas = service.Replicas;
+      service.EnvironmentVariables = translateEnvironmentVariables(service.Env);
+      service.ServiceLabels = translateLabelsToServiceLabels(service.Labels);
+
+      $scope.service = service;
+      Task.query({filters: {service: [service.Name]}}, function (tasks) {
+        Node.query({}, function (nodes) {
+          $scope.displayNode = true;
+          $scope.tasks = tasks.map(function (task) {
+            return new TaskViewModel(task, nodes);
+          });
+          $('#loadingViewSpinner').hide();
+        }, function (e) {
+          $('#loadingViewSpinner').hide();
+          $scope.tasks = tasks.map(function (task) {
+            return new TaskViewModel(task, null);
+          });
+          Messages.error("Failure", e, "Unable to retrieve node information");
+        });
+      }, function (e) {
+        $('#loadingViewSpinner').hide();
+        Messages.error("Failure", e, "Unable to retrieve tasks associated to the service");
+      });
+    }, function (e) {
+      $('#loadingViewSpinner').hide();
+      Messages.error("Failure", e, "Unable to retrieve service details");
+    });
+  }
+
+  function updateServiceAttribute(service, name, newValue) {
+    // ensure we only capture the original previous value, in case we update the attribute multiple times
+    if (!previousServiceValues[name]) {
+      previousServiceValues[name] = service[name];
+    }
+    // update the attribute
+    service[name] = newValue;
+    service.hasChanges = true;
+  }
+
+  function translateEnvironmentVariables(env) {
+    if (env) {
+      var variables = [];
+      env.forEach(function(variable) {
+        var keyValue = variable.split('=');
+        var originalValue = (keyValue.length > 1) ? keyValue[1] : '';
+        variables.push({ key: keyValue[0], value: originalValue, originalValue: originalValue, added: true});
+      });
+      return variables;
+    }
+    return [];
+  }
+  function translateEnvironmentVariablesToEnv(env) {
+    if (env) {
+      var variables = [];
+      env.forEach(function(variable) {
+        if (variable.key && variable.key !== '' && variable.value && variable.value !== '') {
+          variables.push(variable.key + '=' + variable.value);
+        }
+      });
+      return variables;
+    }
+    return [];
+  }
+
+  function translateLabelsToServiceLabels(Labels) {
+    var labels = [];
+    if (Labels) {
+      Object.keys(Labels).forEach(function(key) {
+        labels.push({ key: key, value: Labels[key], originalValue: Labels[key], added: true});
+      });
+    }
+    return labels;
+  }
+  function translateServiceLabelsToLabels(labels) {
+    var Labels = {};
+    if (labels) {
+      labels.forEach(function(label) {
+        Labels[label.key] = label.value;
+      });
+    }
+    return Labels;
+  }
+
+  fetchServiceDetails();
+}]);

app/components/services/services.html

@@ -0,0 +1,84 @@
+<rd-header>
+  <rd-header-title title="Service list">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="services" ui-sref-opts="{reload: true}">
+      <i class="fa fa-refresh" aria-hidden="true"></i>
+    </a>
+  </rd-header-title>
+  <rd-header-content>Services</rd-header-content>
+</rd-header>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-list-alt" title="Services">
+        <div class="pull-right">
+          <i id="loadServicesSpinner" class="fa fa-cog fa-2x fa-spin" style="margin-top: 5px;"></i>
+        </div>
+      </rd-widget-header>
+      <rd-widget-taskbar classes="col-lg-12 col-md-12 col-xs-12">
+        <div class="pull-left">
+          <button type="button" class="btn btn-danger" ng-click="removeAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button>
+          <a class="btn btn-default btn-responsive" type="button" ui-sref="actions.create.service">Add service</a>
+        </div>
+        <div class="pull-right">
+          <input type="text" id="filter" ng-model="state.filter" placeholder="Filter..." class="form-control input-sm" />
+        </div>
+      </rd-widget-taskbar>
+      <rd-widget-body classes="no-padding">
+        <div class="table-responsive">
+          <table class="table table-hover">
+            <thead>
+              <th></th>
+              <th>
+                <a ui-sref="services" ng-click="order('Name')">
+                  Name
+                  <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="services" ng-click="order('Image')">
+                  Image
+                  <span ng-show="sortType == 'Image' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Image' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="services" ng-click="order('Mode')">
+                  Scheduling mode
+                  <span ng-show="sortType == 'Mode' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Mode' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+            </thead>
+            <tbody>
+              <tr ng-repeat="service in (state.filteredServices = ( services | filter:state.filter | orderBy:sortType:sortReverse))">
+                <td><input type="checkbox" ng-model="service.Checked" ng-change="selectItem(service)"/></td>
+                <td><a ui-sref="service({id: service.Id})">{{ service.Name }}</a></td>
+                <td>{{ service.Image }}</td>
+                <td>
+                  {{ service.Mode }}
+                  <span ng-if="service.Mode === 'replicated' && !service.Scale">
+                    <code data-toggle="tooltip" title="Replicas">{{ service.Replicas }}</code>
+                    <a class="interactive" ng-click="service.Scale = true; service.ReplicaCount = service.Replicas;"><i class="fa fa-arrows-v" aria-hidden="true"></i> Scale</a>
+                  </span>
+                  <span ng-if="service.Mode === 'replicated' && service.Scale">
+                    <input class="input-sm" type="number" ng-model="service.Replicas" />
+                    <a class="interactive" ng-click="service.Scale = false;"><i class="fa fa-times"></i></a>
+                    <a class="interactive" ng-click="scaleService(service)"><i class="fa fa-check-square-o"></i></a>
+                  </span>
+                </td>
+              </tr>
+              <tr ng-if="!services">
+                <td colspan="4" class="text-center text-muted">Loading...</td>
+              </tr>
+              <tr ng-if="services.length == 0">
+                <td colspan="4" class="text-center text-muted">No services available.</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </rd-widget-body>
+    <rd-widget>
+  </div>
+</div>

app/components/services/servicesController.js

@@ -0,0 +1,83 @@
+angular.module('services', [])
+.controller('ServicesController', ['$scope', '$stateParams', '$state', 'Service', 'ServiceHelper', 'Messages',
+function ($scope, $stateParams, $state, Service, ServiceHelper, Messages) {
+  $scope.state = {};
+  $scope.state.selectedItemCount = 0;
+  $scope.sortType = 'Name';
+  $scope.sortReverse = false;
+
+  $scope.scaleService = function scaleService(service) {
+    $('#loadServicesSpinner').show();
+    var config = ServiceHelper.serviceToConfig(service.Model);
+    config.Mode.Replicated.Replicas = service.Replicas;
+    Service.update({ id: service.Id, version: service.Version }, config, function (data) {
+      $('#loadServicesSpinner').hide();
+      Messages.send("Service successfully scaled", "New replica count: " + service.Replicas);
+      $state.go('services', {}, {reload: true});
+    }, function (e) {
+      $('#loadServicesSpinner').hide();
+      service.Scale = false;
+      service.Replicas = service.ReplicaCount;
+      Messages.error("Failure", e, "Unable to scale service");
+    });
+  };
+
+  $scope.order = function (sortType) {
+    $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
+    $scope.sortType = sortType;
+  };
+
+  $scope.selectItem = function (item) {
+    if (item.Checked) {
+      $scope.state.selectedItemCount++;
+    } else {
+      $scope.state.selectedItemCount--;
+    }
+  };
+
+  $scope.removeAction = function () {
+    $('#loadServicesSpinner').show();
+    var counter = 0;
+    var complete = function () {
+      counter = counter - 1;
+      if (counter === 0) {
+        $('#loadServicesSpinner').hide();
+      }
+    };
+    angular.forEach($scope.services, function (service) {
+      if (service.Checked) {
+        counter = counter + 1;
+        Service.remove({id: service.Id}, function (d) {
+          if (d.message) {
+            $('#loadServicesSpinner').hide();
+            Messages.error("Unable to remove service", {}, d[0].message);
+          } else {
+            Messages.send("Service deleted", service.Id);
+            var index = $scope.services.indexOf(service);
+            $scope.services.splice(index, 1);
+          }
+          complete();
+        }, function (e) {
+          Messages.error("Failure", e, 'Unable to remove service');
+          complete();
+        });
+      }
+    });
+  };
+
+  function fetchServices() {
+    $('#loadServicesSpinner').show();
+    Service.query({}, function (d) {
+      $scope.services = d.map(function (service) {
+        return new ServiceViewModel(service);
+      });
+      $('#loadServicesSpinner').hide();
+    }, function(e) {
+      $('#loadServicesSpinner').hide();
+      Messages.error("Failure", e, "Unable to retrieve services");
+      $scope.services = [];
+    });
+  }
+
+  fetchServices();
+}]);

app/components/stats/stats.html

@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title="Container stats"></rd-header-title>
   <rd-header-content>
-    Containers > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Stats
+    <a ui-sref="containers">Containers</a> > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Stats
   </rd-header-content>
 </rd-header>
 
@@ -10,7 +10,7 @@
     <rd-widget>
       <rd-widget-body>
         <div class="widget-icon grey pull-left">
-          <i class="fa fa-tasks"></i>
+          <i class="fa fa-server"></i>
         </div>
         <div class="title">{{ container.Name|trimcontainername }}</div>
         <div class="comment">
@@ -59,11 +59,17 @@
         <table class="table table-striped">
           <thead>
             <tr>
-              <th ng-repeat="title in containerTop.Titles">{{title}}</th>
+              <th ng-repeat="title in containerTop.Titles">
+                <a ui-sref="stats({id: container.Id})" ng-click="order(title)">
+                  {{title}}
+                  <span ng-show="sortType == title && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == title && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
             </tr>
           </thead>
           <tbody>
-            <tr ng-repeat="processInfos in containerTop.Processes">
+            <tr ng-repeat="processInfos in state.filteredProcesses = (containerTop.Processes | orderBy:sortType:sortReverse)">
               <td ng-repeat="processInfo in processInfos track by $index">{{processInfo}}</td>
             </tr>
           </tbody>

app/components/stats/statsController.js

@@ -4,6 +4,13 @@ function (Settings, $scope, Messages, $timeout, Container, ContainerTop, $stateP
   // TODO: Force scale to 0-100 for cpu, fix charts on dashboard,
   // TODO: Force memory scale to 0 - max memory
   $scope.ps_args = '';
+  $scope.state = {};
+  $scope.sortType = 'CMD';
+  $scope.sortReverse = false;
+  $scope.order = function (sortType) {
+    $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
+    $scope.sortType = sortType;
+  };
   $scope.getTop = function () {
       ContainerTop.get($stateParams.id, {
           ps_args: $scope.ps_args
@@ -87,7 +94,7 @@ function (Settings, $scope, Messages, $timeout, Container, ContainerTop, $stateP
     },
     {
       scaleLabel: function (valueObj) {
-        return humansizeFilter(parseInt(valueObj.value, 10));
+        return humansizeFilter(parseInt(valueObj.value, 10), 2);
       },
       responsive: true
       //scaleOverride: true,
@@ -100,7 +107,7 @@ function (Settings, $scope, Messages, $timeout, Container, ContainerTop, $stateP
       datasets: [networkRxDataset, networkTxDataset]
     }, {
       scaleLabel: function (valueObj) {
-        return humansizeFilter(parseInt(valueObj.value, 10));
+        return humansizeFilter(parseInt(valueObj.value, 10), 2);
       },
       responsive: true
     });

app/components/swarm/swarm.html

@@ -16,13 +16,14 @@
           <tbody>
             <tr>
               <td>Nodes</td>
-              <td>{{ swarm.Nodes }}</td>
+              <td ng-if="!swarm_mode">{{ swarm.Nodes }}</td>
+              <td ng-if="swarm_mode">{{ info.Swarm.Nodes }}</td>
             </tr>
-            <tr>
+            <tr ng-if="!swarm_mode">
               <td>Images</td>
               <td>{{ info.Images }}</td>
             </tr>
-            <tr>
+            <tr ng-if="!swarm_mode">
               <td>Swarm version</td>
               <td>{{ docker.Version|swarmversion }}</td>
             </tr>
@@ -30,27 +31,29 @@
               <td>Docker API version</td>
               <td>{{ docker.ApiVersion }}</td>
             </tr>
-            <tr>
+            <tr ng-if="!swarm_mode">
               <td>Strategy</td>
               <td>{{ swarm.Strategy }}</td>
             </tr>
             <tr>
               <td>Total CPU</td>
-              <td>{{ info.NCPU }}</td>
+              <td ng-if="!swarm_mode">{{ info.NCPU }}</td>
+              <td ng-if="swarm_mode">{{ totalCPU }}</td>
             </tr>
             <tr>
               <td>Total memory</td>
-              <td>{{ info.MemTotal|humansize }}</td>
+              <td ng-if="!swarm_mode">{{ info.MemTotal|humansize: 2 }}</td>
+              <td ng-if="swarm_mode">{{ totalMemory|humansize: 2 }}</td>
             </tr>
-            <tr>
+            <tr ng-if="!swarm_mode">
               <td>Operating system</td>
               <td>{{ info.OperatingSystem }}</td>
             </tr>
-            <tr>
+            <tr ng-if="!swarm_mode">
               <td>Kernel version</td>
               <td>{{ info.KernelVersion }}</td>
             </tr>
-            <tr>
+            <tr ng-if="!swarm_mode">
               <td>Go version</td>
               <td>{{ docker.GoVersion }}</td>
             </tr>
@@ -60,8 +63,9 @@
     </rd-widget>
   </div>
 </div>
+
 <div class="row">
-  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" ng-if="!swarm_mode">
     <rd-widget>
       <rd-widget-header icon="fa-hdd-o" title="Node status"></rd-widget-header>
       <rd-widget-body classes="no-padding">
@@ -126,4 +130,69 @@
       </rd-widget-body>
     </rd-widget>
   </div>
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" ng-if="swarm_mode">
+    <rd-widget>
+      <rd-widget-header icon="fa-hdd-o" title="Node status"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th>
+                <a ui-sref="swarm" ng-click="order('Name')">
+                  Name
+                  <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="swarm" ng-click="order('type')">
+                  Role
+                  <span ng-show="sortType == 'type' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'type' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="swarm" ng-click="order('cpu')">
+                  CPU
+                  <span ng-show="sortType == 'cpu' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'cpu' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="swarm" ng-click="order('memory')">
+                  Memory
+                  <span ng-show="sortType == 'memory' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'memory' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="swarm" ng-click="order('Engine')">
+                  Engine
+                  <span ng-show="sortType == 'Engine' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Engine' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+              <th>
+                <a ui-sref="swarm" ng-click="order('Status')">
+                  Status
+                  <span ng-show="sortType == 'Status' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Status' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr ng-repeat="node in (state.filteredNodes = (nodes | filter:state.filter | orderBy:sortType:sortReverse))">
+              <td>{{ node.Description.Hostname }}</td>
+              <td>{{ node.Spec.Role }}</td>
+              <td>{{ node.Description.Resources.NanoCPUs / 1000000000 }}</td>
+              <td>{{ node.Description.Resources.MemoryBytes|humansize }}</td>
+              <td>{{ node.Description.Engine.EngineVersion }}</td>
+              <td><span class="label label-{{ node.Status.State|nodestatusbadge }}">{{ node.Status.State }}</span></td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
 </div>

app/components/swarm/swarmController.js

@@ -1,62 +1,82 @@
 angular.module('swarm', [])
-  .controller('SwarmController', ['$scope', 'Info', 'Version', 'Settings',
-    function ($scope, Info, Version, Settings) {
+.controller('SwarmController', ['$scope', 'Info', 'Version', 'Node',
+function ($scope, Info, Version, Node) {
 
-      $scope.sortType = 'Name';
-      $scope.sortReverse = true;
-      $scope.info = {};
-      $scope.docker = {};
-      $scope.swarm = {};
+  $scope.sortType = 'Name';
+  $scope.sortReverse = true;
+  $scope.info = {};
+  $scope.docker = {};
+  $scope.swarm = {};
+  $scope.swarm_mode = false;
+  $scope.totalCPU = 0;
+  $scope.totalMemory = 0;
 
-      $scope.order = function(sortType) {
-        $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
-        $scope.sortType = sortType;
-      };
+  $scope.order = function(sortType) {
+    $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
+    $scope.sortType = sortType;
+  };
 
-      Version.get({}, function (d) {
-        $scope.docker = d;
-      });
-      Info.get({}, function (d) {
-        $scope.info = d;
-        extractSwarmInfo(d);
+  Version.get({}, function (d) {
+    $scope.docker = d;
+  });
+
+  Info.get({}, function (d) {
+    $scope.info = d;
+    if (!_.startsWith(d.ServerVersion, 'swarm')) {
+      $scope.swarm_mode = true;
+      Node.query({}, function(d) {
+        $scope.nodes = d;
+        var CPU = 0, memory = 0;
+        angular.forEach(d, function(node) {
+          CPU += node.Description.Resources.NanoCPUs;
+          memory += node.Description.Resources.MemoryBytes;
+        });
+        $scope.totalCPU = CPU / 1000000000;
+        $scope.totalMemory = memory;
       });
+    } else {
+      extractSwarmInfo(d);
+    }
+  });
 
-      function extractSwarmInfo(info) {
-        // Swarm info is available in SystemStatus object
-        var systemStatus = info.SystemStatus;
-        // Swarm strategy
-        $scope.swarm[systemStatus[1][0]] = systemStatus[1][1];
-        // Swarm filters
-        $scope.swarm[systemStatus[2][0]] = systemStatus[2][1];
-        // Swarm node count
-        var node_count = parseInt(systemStatus[3][1], 10);
-        $scope.swarm[systemStatus[3][0]] = node_count;
+  function extractSwarmInfo(info) {
+    // Swarm info is available in SystemStatus object
+    var systemStatus = info.SystemStatus;
+    // Swarm strategy
+    $scope.swarm[systemStatus[1][0]] = systemStatus[1][1];
+    // Swarm filters
+    $scope.swarm[systemStatus[2][0]] = systemStatus[2][1];
+    // Swarm node count
+    var nodes = systemStatus[0][1] === 'primary' ? systemStatus[3][1] : systemStatus[4][1];
+    var node_count = parseInt(nodes, 10);
+    $scope.swarm[systemStatus[3][0]] = node_count;
 
-        $scope.swarm.Status = [];
-        extractNodesInfo(systemStatus, node_count);
-      }
+    $scope.swarm.Status = [];
+    extractNodesInfo(systemStatus, node_count);
+  }
 
-      function extractNodesInfo(info, node_count) {
-        // First information for node1 available at element #4 of SystemStatus
-        // The next 10 elements are information related to the node
-        var node_offset = 4;
-        for (i = 0; i < node_count; i++) {
-          extractNodeInfo(info, node_offset);
-          node_offset += 9;
-        }
-      }
+  function extractNodesInfo(info, node_count) {
+    // First information for node1 available at element #4 of SystemStatus if connected to a primary
+    // If connected to a replica, information for node1 is available at element #5
+    // The next 10 elements are information related to the node
+    var node_offset = info[0][1] === 'primary' ? 4 : 5;
+    for (i = 0; i < node_count; i++) {
+      extractNodeInfo(info, node_offset);
+      node_offset += 9;
+    }
+  }
 
-      function extractNodeInfo(info, offset) {
-        var node = {};
-        node.name = info[offset][0];
-        node.ip = info[offset][1];
-        node.id = info[offset + 1][1];
-        node.status = info[offset + 2][1];
-        node.containers = info[offset + 3][1];
-        node.cpu = info[offset + 4][1].split('/')[1];
-        node.memory = info[offset + 5][1].split('/')[1];
-        node.labels = info[offset + 6][1];
-        node.version = info[offset + 8][1];
-        $scope.swarm.Status.push(node);
-      }
-    }]);
+  function extractNodeInfo(info, offset) {
+    var node = {};
+    node.name = info[offset][0];
+    node.ip = info[offset][1];
+    node.id = info[offset + 1][1];
+    node.status = info[offset + 2][1];
+    node.containers = info[offset + 3][1];
+    node.cpu = info[offset + 4][1].split('/')[1];
+    node.memory = info[offset + 5][1].split('/')[1];
+    node.labels = info[offset + 6][1];
+    node.version = info[offset + 8][1];
+    $scope.swarm.Status.push(node);
+  }
+}]);

app/components/task/task.html

@@ -0,0 +1,50 @@
+<rd-header>
+  <rd-header-title title="Task details">
+    <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
+  </rd-header-title>
+  <rd-header-content>
+    <a ui-sref="services">Services</a> > <a ui-sref="service({id: task.ServiceID})">{{ serviceName }}</a> > {{ task.ID }}
+  </rd-header-content>
+</rd-header>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-tasks" title="Task status"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr>
+              <td>ID</td>
+              <td>{{ task.ID }}</td>
+            </tr>
+            <tr>
+              <td>State</td>
+              <td><span class="label label-{{ task.Status.State|taskstatusbadge }}">{{ task.Status.State }}</span></td>
+            </tr>
+            <tr ng-if="task.Status.Err">
+              <td>Error message</td>
+              <td><code>{{ task.Status.Err }}</code></td>
+            </tr>
+            <tr>
+              <td>Image</td>
+              <td>{{ task.Spec.ContainerSpec.Image }}</td>
+            </tr>
+            <tr>
+              <td>Slot</td>
+              <td>{{ task.Slot }}</td>
+            </tr>
+            <tr>
+              <td>Created</td>
+              <td>{{ task.CreatedAt|getisodate }}</td>
+            </tr>
+            <tr ng-if="task.Status.ContainerStatus.ContainerID">
+              <td>Container ID</td>
+              <td>{{ task.Status.ContainerStatus.ContainerID }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>

app/components/task/taskController.js

@@ -0,0 +1,29 @@
+angular.module('task', [])
+.controller('TaskController', ['$scope', '$stateParams', '$state', 'Task', 'Service', 'Messages',
+function ($scope, $stateParams, $state, Task, Service, Messages) {
+
+  $scope.task = {};
+  $scope.serviceName = 'service';
+  $scope.isTaskRunning = false;
+
+  function fetchTaskDetails() {
+    $('#loadingViewSpinner').show();
+    Task.get({id: $stateParams.id}, function (d) {
+      $scope.task = d;
+      fetchAssociatedServiceDetails(d.ServiceID);
+      $('#loadingViewSpinner').hide();
+    }, function (e) {
+      Messages.error("Failure", e, "Unable to retrieve task details");
+    });
+  }
+
+  function fetchAssociatedServiceDetails(serviceId) {
+    Service.get({id: serviceId}, function (d) {
+      $scope.serviceName = d.Spec.Name;
+    }, function (e) {
+      Messages.error("Failure", e, "Unable to retrieve associated service details");
+    });
+  }
+
+  fetchTaskDetails();
+}]);

app/components/templates/templates.html

@@ -7,38 +7,24 @@
   <rd-header-content>Templates</rd-header-content>
 </rd-header>
 
-<div class="row">
+<div class="row" ng-if="state.selectedTemplate">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-rocket" title="Available templates">
-        <div class="pull-right">
-          <i id="loadTemplatesSpinner" class="fa fa-cog fa-2x fa-spin" style="margin-top: 5px;"></i>
-        </div>
-      </rd-widget-header>
-      <rd-widget-body classes="padding">
-        <div class="template-list">
-          <div ng-repeat="tpl in templates" class="container-template hvr-grow" id="template_{{ $index }}" ng-click="selectTemplate($index)">
-            <img class="logo" ng-src="{{ tpl.logo }}" />
-            <div class="title">{{ tpl.title }}</div>
-            <div class="description">{{ tpl.description }}</div>
-          </div>
-        </div>
-      </rd-widget-body>
-    </rd-widget>
-  </div>
-</div>
-
-<div class="row" ng-if="selectedTemplate">
-  <div class="col-lg-12 col-md-12 col-xs-12">
-    <rd-widget>
-      <rd-widget-header icon="fa-cogs" title="Configuration"></rd-widget-header>
+      <rd-widget-custom-header icon="state.selectedTemplate.logo" title="state.selectedTemplate.image">
+      </rd-widget-custom-header>
       <rd-widget-body classes="padding">
         <form class="form-horizontal">
-          <div class="form-group" ng-if="globalNetworkCount === 0">
+          <div class="form-group" ng-if="globalNetworkCount === 0 && !swarm_mode">
             <div class="col-sm-12">
               <span class="small text-muted">When using Swarm, we recommend deploying containers in a shared network. Looks like you don't have any shared network, head over the <a ui-sref="networks">networks view</a> to create one.</span>
             </div>
           </div>
+          <div class="form-group" ng-if="swarm_mode">
+            <div class="col-sm-12">
+              <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+              <span class="small text-muted">App templates cannot be used with swarm-mode at the moment. You can still use them to quickly deploy containers to the Docker host.</span>
+            </div>
+          </div>
           <!-- name-and-network-inputs -->
           <div class="form-group">
             <label for="image_registry" class="col-sm-2 control-label text-left">Name</label>
@@ -53,29 +39,101 @@
             </div>
           </div>
           <!-- !name-and-network-inputs -->
-          <div ng-repeat="var in selectedTemplate.env" ng-if="!var.set" class="form-group">
+          <div ng-repeat="var in state.selectedTemplate.env" ng-if="!var.set" class="form-group">
             <label for="field_{{ $index }}" class="col-sm-2 control-label text-left">{{ var.label }}</label>
             <div class="col-sm-10">
-              <select ng-if="!swarm && var.type === 'container'" ng-options="container|containername for container in runningContainers" class="selectpicker form-control" ng-model="var.value">
+              <select ng-if="(!swarm || swarm && swarm_mode) && var.type === 'container'" ng-options="container|containername for container in runningContainers" class="selectpicker form-control" ng-model="var.value">
                 <option selected disabled hidden value="">Select a container</option>
               </select>
-              <select ng-if="swarm && var.type === 'container'" ng-options="container|swarmcontainername for container in runningContainers" class="selectpicker form-control" ng-model="var.value">
+              <select ng-if="swarm && !swarm_mode && var.type === 'container'" ng-options="container|swarmcontainername for container in runningContainers" class="selectpicker form-control" ng-model="var.value">
                 <option selected disabled hidden value="">Select a container</option>
               </select>
               <input ng-if="!var.type || !var.type === 'container'" type="text" class="form-control" ng-model="var.value" id="field_{{ $index }}">
             </div>
           </div>
+          <div class="form-group">
+            <div class="col-sm-12">
+              <a class="small interactive" ng-if="!state.showAdvancedOptions" ng-click="state.showAdvancedOptions = true;">
+                <i class="fa fa-plus space-right" aria-hidden="true"></i> Show advanced options
+              </a>
+              <a class="small interactive" ng-if="state.showAdvancedOptions" ng-click="state.showAdvancedOptions = false;">
+                <i class="fa fa-minus space-right" aria-hidden="true"></i> Hide advanced options
+              </a>
+            </div>
+          </div>
+          <div class="form-group" ng-if="state.showAdvancedOptions">
+            <label for="container_ports" class="col-sm-1 control-label text-left">Port mapping</label>
+            <div class="col-sm-11" style="margin-top: 5px;">
+              <span class="label label-default interactive" ng-click="addPortBinding()">
+                <i class="fa fa-plus-circle" aria-hidden="true"></i> map additional port
+              </span>
+            </div>
+            <!-- port-mapping-input-list -->
+            <div class="col-sm-offset-1 col-sm-11 form-inline" style="margin-top: 10px;">
+              <div ng-repeat="portBinding in formValues.ports" style="margin-top: 2px;">
+                <div class="input-group col-sm-5 input-group-sm">
+                  <span class="input-group-addon">host</span>
+                  <input type="text" class="form-control" ng-model="portBinding.hostPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)">
+                </div>
+                <div class="input-group col-sm-5 input-group-sm">
+                  <span class="input-group-addon">container</span>
+                  <input type="text" class="form-control" ng-model="portBinding.containerPort" placeholder="e.g. 80">
+                </div>
+                <div class="input-group col-sm-1 input-group-sm">
+                  <select class="selectpicker form-control" ng-model="portBinding.protocol">
+                    <option value="tcp">tcp</option>
+                    <option value="udp">udp</option>
+                  </select>
+                  <span class="input-group-btn">
+                    <button class="btn btn-default" type="button" ng-click="removePortBinding($index)">
+                      <i class="fa fa-minus" aria-hidden="true"></i>
+                    </button>
+                  </span>
+                </div>
+              </div>
+            </div>
+            <!-- !port-mapping-input-list -->
+          </div>
+          <!-- !port-mapping -->
+          <div class="form-group">
+            <div class="col-sm-12">
+              <button type="button" class="btn btn-default btn-sm" ng-disabled="!formValues.network" ng-click="createTemplate()">Create</button>
+              <i id="createContainerSpinner" class="fa fa-cog fa-spin" style="margin-left: 5px; display: none;"></i>
+            </div>
+          </div>
         </form>
       </rd-widget-body>
     </rd-widget>
   </div>
 </div>
 
-<div class="row" ng-if="selectedTemplate">
-  <div class="col-lg-12 col-md-12 col-xs-12" style="text-align: center;">
-    <div>
-      <i id="createContainerSpinner" class="fa fa-cog fa-3x fa-spin" style="margin-bottom: 5px; display: none;"></i>
-    </div>
-    <button type="button" class="btn btn-default btn-lg" ng-disabled="!formValues.network" ng-click="createTemplate()">Create</button>
+<div class="row" ng-if="state.selectedTemplate">
+
+</div>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-rocket" title="Available templates">
+        <div class="pull-right">
+          <i id="loadTemplatesSpinner" class="fa fa-cog fa-2x fa-spin" style="margin-top: 5px;"></i>
+        </div>
+      </rd-widget-header>
+      <rd-widget-body classes="padding">
+        <div class="template-list">
+          <div ng-repeat="tpl in templates" class="container-template hvr-underline-from-center" id="template_{{ $index }}" ng-click="selectTemplate($index)">
+            <img class="logo" ng-src="{{ tpl.logo }}" />
+            <div class="title">{{ tpl.title }}</div>
+            <div class="description">{{ tpl.description }}</div>
+          </div>
+          <div ng-if="!templates" class="text-center text-muted">
+            Loading...
+          </div>
+          <div ng-if="templates.length == 0" class="text-center text-muted">
+            No templates available.
+          </div>
+        </div>
+      </rd-widget-body>
+    </rd-widget>
   </div>
 </div>

app/components/templates/templatesController.js

@@ -1,15 +1,26 @@
 angular.module('templates', [])
-.controller('TemplatesController', ['$scope', '$q', '$state', '$filter', 'Config', 'Container', 'ContainerHelper', 'Image', 'Volume', 'Network', 'Templates', 'Messages',
-function ($scope, $q, $state, $filter, Config, Container, ContainerHelper, Image, Volume, Network, Templates, Messages) {
-  $scope.templates = [];
-  $scope.selectedTemplate = null;
+.controller('TemplatesController', ['$scope', '$q', '$state', '$filter', 'Config', 'Info', 'Container', 'ContainerHelper', 'Image', 'Volume', 'Network', 'Templates', 'TemplateHelper', 'Messages',
+function ($scope, $q, $state, $filter, Config, Info, Container, ContainerHelper, Image, Volume, Network, Templates, TemplateHelper, Messages) {
+  $scope.state = {
+    selectedTemplate: null,
+    showAdvancedOptions: false
+  };
   $scope.formValues = {
     network: "",
-    name: ""
+    name: "",
+    ports: []
   };
 
   var selectedItem = -1;
 
+  $scope.addPortBinding = function() {
+    $scope.formValues.ports.push({ hostPort: '', containerPort: '', protocol: 'tcp' });
+  };
+
+  $scope.removePortBinding = function(index) {
+    $scope.formValues.ports.splice(index, 1);
+  };
+
   // TODO: centralize, already present in createContainerController
   function createContainer(config) {
     Container.create(config, function (d) {
@@ -75,6 +86,26 @@ function ($scope, $q, $state, $filter, Config, Container, ContainerHelper, Image
     };
   }
 
+  function preparePortBindings(config, ports) {
+    var bindings = {};
+    ports.forEach(function (portBinding) {
+      if (portBinding.containerPort) {
+        var key = portBinding.containerPort + "/" + portBinding.protocol;
+        var binding = {};
+        if (portBinding.hostPort && portBinding.hostPort.indexOf(':') > -1) {
+          var hostAndPort = portBinding.hostPort.split(':');
+          binding.HostIp = hostAndPort[0];
+          binding.HostPort = hostAndPort[1];
+        } else {
+          binding.HostPort = portBinding.hostPort;
+        }
+        bindings[key] = [binding];
+        config.ExposedPorts[key] = {};
+      }
+    });
+    config.HostConfig.PortBindings = bindings;
+  }
+
   function createConfigFromTemplate(template) {
     var containerConfig = getInitialConfiguration();
     containerConfig.Image = template.image;
@@ -96,12 +127,7 @@ function ($scope, $q, $state, $filter, Config, Container, ContainerHelper, Image
         }
       });
     }
-    if (template.ports) {
-      template.ports.forEach(function (p) {
-        containerConfig.ExposedPorts[p] = {};
-        containerConfig.HostConfig.PortBindings[p] = [{ HostPort: ""}];
-      });
-    }
+    preparePortBindings(containerConfig, $scope.formValues.ports);
     return containerConfig;
   }
 
@@ -129,7 +155,7 @@ function ($scope, $q, $state, $filter, Config, Container, ContainerHelper, Image
 
   $scope.createTemplate = function() {
     $('#createContainerSpinner').show();
-    var template = $scope.selectedTemplate;
+    var template = $scope.state.selectedTemplate;
     var containerConfig = createConfigFromTemplate(template);
     var imageConfig = {
       fromImage: template.image.split(':')[0],
@@ -145,11 +171,13 @@ function ($scope, $q, $state, $filter, Config, Container, ContainerHelper, Image
     $('#template_' + id).toggleClass("container-template--selected");
     if (selectedItem === id) {
       selectedItem = -1;
-      $scope.selectedTemplate = null;
+      $scope.state.selectedTemplate = null;
     } else {
       $('#template_' + selectedItem).toggleClass("container-template--selected");
       selectedItem = id;
-      $scope.selectedTemplate = $scope.templates[id];
+      var selectedTemplate = $scope.templates[id];
+      $scope.state.selectedTemplate = selectedTemplate;
+      $scope.formValues.ports = selectedTemplate.ports ? TemplateHelper.getPortBindings(selectedTemplate.ports) : [];
     }
   };
 
@@ -160,11 +188,17 @@ function ($scope, $q, $state, $filter, Config, Container, ContainerHelper, Image
     }, function (e) {
       $('#loadTemplatesSpinner').hide();
       Messages.error("Failure", e, "Unable to retrieve apps list");
+      $scope.templates = [];
     });
   }
 
   Config.$promise.then(function (c) {
     $scope.swarm = c.swarm;
+    Info.get({}, function(info) {
+      if ($scope.swarm && !_.startsWith(info.ServerVersion, 'swarm')) {
+        $scope.swarm_mode = true;
+      }
+    });
     var containersToHideLabels = c.hiddenLabels;
     Network.query({}, function (d) {
       var networks = d;

app/components/volumes/volumes.html

@@ -16,7 +16,7 @@
     </rd-widget-header>
     <rd-widget-taskbar classes="col-lg-12">
       <div class="pull-left">
-        <button type="button" class="btn btn-danger" ng-click="removeAction()" ng-disabled="!state.selectedItemCount">Remove</button>
+        <button type="button" class="btn btn-danger" ng-click="removeAction()" ng-disabled="!state.selectedItemCount"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button>
         <a class="btn btn-default" type="button" ui-sref="actions.create.volume">Add volume</a>
       </div>
       <div class="pull-right">
@@ -59,6 +59,12 @@
               <td>{{ volume.Driver }}</td>
               <td>{{ volume.Mountpoint }}</td>
             </tr>
+            <tr ng-if="!volumes">
+              <td colspan="4" class="text-center text-muted">Loading...</td>
+            </tr>
+            <tr ng-if="volumes.length == 0">
+              <td colspan="4" class="text-center text-muted">No volumes available.</td>
+            </tr>
           </tbody>
         </table>
       </div>

app/components/volumes/volumesController.js

@@ -5,7 +5,6 @@ function ($scope, $state, Volume, Messages) {
   $scope.state.selectedItemCount = 0;
   $scope.sortType = 'Name';
   $scope.sortReverse = true;
-
   $scope.config = {
     Name: ''
   };
@@ -60,6 +59,7 @@ function ($scope, $state, Volume, Messages) {
     }, function (e) {
       $('#loadVolumesSpinner').hide();
       Messages.error("Failure", e, "Unable to retrieve volumes");
+      $scope.volumes = [];
     });
   }
   fetchVolumes();

app/directives/widget-custom-header.js

@@ -0,0 +1,15 @@
+angular
+.module('portainer')
+.directive('rdWidgetCustomHeader', function rdWidgetCustomHeader() {
+  var directive = {
+    requires: '^rdWidget',
+    scope: {
+      title: '=',
+      icon: '='
+    },
+    transclude: true,
+    template: '<div class="widget-header"><div class="row"><span class="pull-left"><img class="custom-header-ico" ng-src="{{icon}}"></img> <span class="text-muted"> {{title}} </span> </span><span class="pull-right col-xs-6 col-sm-4" ng-transclude></span></div></div>',
+    restrict: 'E'
+  };
+  return directive;
+});

app/shared/filters.js

@@ -18,6 +18,24 @@ angular.module('portainer.filters', [])
     }
   };
 })
+.filter('taskstatusbadge', function () {
+  'use strict';
+  return function (text) {
+    var status = _.toLower(text);
+    if (status.indexOf('new') !== -1 || status.indexOf('allocated') !== -1 ||
+      status.indexOf('assigned') !== -1 || status.indexOf('accepted') !== -1) {
+      return 'info';
+    } else if (status.indexOf('pending') !== -1) {
+      return 'warning';
+    } else if (status.indexOf('shutdown') !== -1 || status.indexOf('failed') !== -1 ||
+      status.indexOf('rejected') !== -1) {
+      return 'danger';
+    } else if (status.indexOf('complete') !== -1) {
+      return 'primary';
+    }
+    return 'success';
+  };
+})
 .filter('containerstatusbadge', function () {
   'use strict';
   return function (text) {
@@ -105,15 +123,13 @@ angular.module('portainer.filters', [])
 })
 .filter('humansize', function () {
   'use strict';
-  return function (bytes) {
-    var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-    if (bytes === 0) {
-      return 'n/a';
+  return function (bytes, round) {
+    if (!round) {
+      round = 1;
+    }
+    if (bytes || bytes === 0) {
+      return filesize(bytes, {base: 10, round: round});
     }
-    var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
-    var value = bytes / Math.pow(1024, i);
-    var decimalPlaces = (i < 1) ? 0 : (i - 1);
-    return value.toFixed(decimalPlaces) + ' ' + sizes[[i]];
   };
 })
 .filter('containername', function () {
@@ -191,4 +207,19 @@ angular.module('portainer.filters', [])
   return function (obj) {
     return _.isEmpty(obj);
   };
+})
+.filter('ipaddress', function () {
+  'use strict';
+  return function (ip) {
+    return ip.slice(0, ip.indexOf('/'));
+  };
+})
+.filter('arraytostr', function () {
+  'use strict';
+  return function (arr, separator) {
+    if (arr) {
+      return _.join(arr, separator);
+    }
+    return '';
+  };
 });

app/shared/helpers.js

@@ -34,4 +34,57 @@ angular.module('portainer.helpers', [])
       });
     }
   };
+}])
+.factory('ServiceHelper', [function ServiceHelperFactory() {
+  'use strict';
+  return {
+    serviceToConfig: function(service) {
+      return {
+        Name: service.Spec.Name,
+        TaskTemplate: service.Spec.TaskTemplate,
+        Mode: service.Spec.Mode,
+        Networks: service.Spec.Networks,
+        EndpointSpec: service.Spec.EndpointSpec
+      };
+    }
+  };
+}])
+.factory('TemplateHelper', [function TemplateHelperFactory() {
+  'use strict';
+  return {
+    getPortBindings: function(ports) {
+      var bindings = [];
+      ports.forEach(function (port) {
+        var portAndProtocol = _.split(port, '/');
+        var binding = {
+          containerPort: portAndProtocol[0],
+          protocol: portAndProtocol[1]
+        };
+        bindings.push(binding);
+      });
+      return bindings;
+    },
+    //Not used atm, may prove useful later
+    getVolumeBindings: function(volumes) {
+      var bindings = [];
+      volumes.forEach(function (volume) {
+        bindings.push({ containerPath: volume });
+      });
+      return bindings;
+    },
+    //Not used atm, may prove useful later
+    getEnvBindings: function(env) {
+      var bindings = [];
+      env.forEach(function (envvar) {
+        var binding = {
+          name: envvar.name
+        };
+        if (envvar.set) {
+          binding.value = envvar.set;
+        }
+        bindings.push(binding);
+      });
+      return bindings;
+    }
+  };
 }]);

app/shared/services.js

@@ -37,6 +37,25 @@ angular.module('portainer.services', ['ngResource', 'ngSanitize'])
             }
         });
     }])
+    .factory('Service', ['$resource', 'Settings', function ServiceFactory($resource, Settings) {
+      'use strict';
+      // https://docs.docker.com/engine/reference/api/docker_remote_api_<%= remoteApiVersion %>/#/3-9-services
+      return $resource(Settings.url + '/services/:id/:action', {}, {
+        get: { method: 'GET', params: {id: '@id'} },
+        query: { method: 'GET', isArray: true },
+        create: { method: 'POST', params: {action: 'create'} },
+        update: { method: 'POST', params: {id: '@id', action: 'update', version: '@version'} },
+        remove: { method: 'DELETE', params: {id: '@id'} }
+      });
+    }])
+    .factory('Task', ['$resource', 'Settings', function TaskFactory($resource, Settings) {
+      'use strict';
+      // https://docs.docker.com/engine/reference/api/docker_remote_api_<%= remoteApiVersion %>/#/3-9-services
+      return $resource(Settings.url + '/tasks/:id', {}, {
+        get: { method: 'GET', params: {id: '@id'} },
+        query: { method: 'GET', isArray: true, params: {filters: '@filters'} }
+      });
+    }])
     .factory('Exec', ['$resource', 'Settings', function ExecFactory($resource, Settings) {
       'use strict';
       // https://docs.docker.com/engine/reference/api/docker_remote_api_<%= remoteApiVersion %>/#/exec-resize
@@ -131,6 +150,22 @@ angular.module('portainer.services', ['ngResource', 'ngSanitize'])
             get: {method: 'GET'}
         });
     }])
+    .factory('Node', ['$resource', 'Settings', function NodeFactory($resource, Settings) {
+        'use strict';
+        // https://docs.docker.com/engine/reference/api/docker_remote_api_<%= remoteApiVersion %>/#/3-7-nodes
+        return $resource(Settings.url + '/nodes', {}, {
+          query: {
+            method: 'GET', isArray: true
+          }
+        });
+    }])
+    .factory('Swarm', ['$resource', 'Settings', function SwarmFactory($resource, Settings) {
+        'use strict';
+        // https://docs.docker.com/engine/reference/api/docker_remote_api_<%= remoteApiVersion %>/#/3-8-swarm
+        return $resource(Settings.url + '/swarm', {}, {
+            get: {method: 'GET'}
+        });
+    }])
     .factory('Auth', ['$resource', 'Settings', function AuthFactory($resource, Settings) {
         'use strict';
         // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#check-auth-configuration

app/shared/viewmodel.js

@@ -8,12 +8,53 @@ function ImageViewModel(data) {
   this.VirtualSize = data.VirtualSize;
 }
 
+function TaskViewModel(data, node_data) {
+  this.Id = data.ID;
+  this.Created = data.CreatedAt;
+  this.Updated = data.UpdatedAt;
+  this.Slot = data.Slot;
+  this.Status = data.Status.State;
+  if (node_data) {
+    for (var i = 0; i < node_data.length; ++i) {
+      if (data.NodeID === node_data[i].ID) {
+        this.Node = node_data[i].Description.Hostname;
+      }
+    }
+  }
+}
+
+function ServiceViewModel(data) {
+  this.Model = data;
+  this.Id = data.ID;
+  this.Name = data.Spec.Name;
+  this.Image = data.Spec.TaskTemplate.ContainerSpec.Image;
+  this.Version = data.Version.Index;
+  if (data.Spec.Mode.Replicated) {
+    this.Mode = 'replicated' ;
+    this.Replicas = data.Spec.Mode.Replicated.Replicas;
+  } else {
+    this.Mode = 'global';
+  }
+  if (data.Spec.TaskTemplate.ContainerSpec) {
+    this.Labels = data.Spec.TaskTemplate.ContainerSpec.Labels;
+  }
+  if (data.Spec.TaskTemplate.ContainerSpec.Env) {
+    this.Env = data.Spec.TaskTemplate.ContainerSpec.Env;
+  }
+  if (data.Endpoint.Ports) {
+    this.Ports = data.Endpoint.Ports;
+  }
+  this.Checked = false;
+  this.Scale = false;
+  this.EditName = false;
+}
+
 function ContainerViewModel(data) {
   this.Id = data.Id;
   this.Status = data.Status;
   this.Names = data.Names;
   // Unavailable in Docker < 1.10
-  if (data.NetworkSettings) {
+  if (data.NetworkSettings && !_.isEmpty(data.NetworkSettings.Networks)) {
     this.IP = data.NetworkSettings.Networks[Object.keys(data.NetworkSettings.Networks)[0]].IPAddress;
   }
   this.Image = data.Image;
@@ -64,6 +105,9 @@ function createEventDetails(event) {
       case 'unpause':
       details = 'Container ' + eventAttr.name + ' unpaused';
       break;
+      case 'attach':
+      details = 'Container ' + eventAttr.name + ' attached';
+      break;
       default:
       if (event.Action.indexOf('exec_create') === 0) {
         details = 'Exec instance created';
@@ -118,6 +162,12 @@ function createEventDetails(event) {
       case 'destroy':
       details = 'Volume ' + event.Actor.ID + ' deleted';
       break;
+      case 'mount':
+      details = 'Volume ' + event.Actor.ID + ' mounted';
+      break;
+      case 'unmount':
+      details = 'Volume ' + event.Actor.ID + ' unmounted';
+      break;
       default:
       details = 'Unsupported event';
     }

assets/css/app.css

@@ -1,98 +1,7 @@
-.container > hr {
-    margin: 60px 0;
-}
-
-.jumbotron {
-    margin: 80px 0;
-    text-align: center;
-}
-
-.jumbotron h1 {
-    font-size: 100px;
-    line-height: 1;
-}
-
-.jumbotron .lead {
-    font-size: 24px;
-    line-height: 1.25;
-}
-
-.jumbotron .btn {
-    padding: 14px 24px;
-    font-size: 21px;
-}
-
-.marketing {
-    margin: 60px 0;
-}
-
-.marketing p + h4 {
-    margin-top: 28px;
-}
-
-.masthead .nav {
-    margin: 0;
-    margin: 0 0 2em 0;
-    width: 100%;
-}
-
-.masthead .nav.well {
-    padding: 0;
-}
-
-.masthead .nav li {
-    display: table-cell;
-    float: none;
-    width: 1%;
-}
-
-.masthead .nav li a {
-    font-weight: bold;
-    text-align: center;
-    border-right: 1px solid rgba(0,0,0,.1);
-    border-left: 1px solid rgba(255,255,255,.75);
-}
-
-.masthead .nav li:first-child a {
-    border-left: 0;
-    border-radius: 3px 0 0 3px;
-}
-.masthead .nav li:last-child a {
-    border-right: 0;
-    border-radius: 0 3px 3px 0;
-}
-
 .btn-group button {
     margin: 3px;
 }
 
-.detail {
-    width: 80%;
-    margin: 0 auto;
-}
-
-.center {
-    width: 100%;
-    margin: 0 auto;
-}
-
-.btn-remove {
-    max-width: 70%;
-    margin: 0 auto;
-}
-
-.actions {
-    margin: 0 auto;
-}
-
-.container-bottom {
-    height: 50px;
-}
-
-.well {
-    padding: 10px 15px 0 15px;
-}
-
 .messages {
     max-height: 50px;
     overflow-x: hidden;
@@ -106,14 +15,6 @@
     border-width: 0 0 0 1em;
 }
 
-.inline-four .form-control {
-    max-width: 25%;
-}
-
-.dropdown {
-    cursor: pointer;
-}
-
 .logo {
   display: inline;
   width: 100%;
@@ -162,11 +63,7 @@ input[type="radio"] {
   vertical-align: middle;
 }
 
-.clickable {
-  cursor: pointer;
-}
-
-.text-icon {
+.space-right {
   margin-right: 5px;
 }
 
@@ -182,16 +79,17 @@ input[type="radio"] {
   color: white;
 }
 
-.image-tag {
-  margin-right: 5px;
-}
-
-.label.tag {
-  margin-right: 5px;
-}
-
 .widget .widget-body table tbody .image-tag {
   font-size: 90% !important;
+  margin-right: 5px;
+}
+
+.widget .widget-body table tbody .fit-text-size {
+  font-size: 90% !important;
+}
+
+.nopadding {
+  padding: 0 !important;
 }
 
 .terminal-container {
@@ -203,25 +101,73 @@ input[type="radio"] {
   cursor: pointer;
 }
 
-.action-group {
-  margin: 10px;
-}
-
-.btn-ico {
-  margin-right: 5px;
-}
-
 .template-list {
   display: flex;
   flex-wrap: wrap;
 }
 
+.custom-header-ico {
+  max-width: 32px;
+  max-height: 32px;
+  margin-right: 2px;
+}
+
+.btn-responsive {
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+
+@media screen and (min-width: 1107px) {
+  .btn-responsive {
+    padding: 6px 12px;
+    font-size: 14px;
+    line-height: 1.42857143;
+    border-radius: 4px;
+  }
+}
+
+/* Underline From Center */
+.hvr-underline-from-center {
+  display: inline-block;
+  vertical-align: middle;
+  -webkit-transform: translateZ(0);
+  transform: translateZ(0);
+  box-shadow: 0 0 1px rgba(0, 0, 0, 0);
+  -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
+  -moz-osx-font-smoothing: grayscale;
+  position: relative;
+  overflow: hidden;
+}
+.hvr-underline-from-center:before {
+  content: "";
+  position: absolute;
+  z-index: -1;
+  left: 50%;
+  right: 50%;
+  bottom: 0;
+  background: #85898b;
+  height: 2px;
+  -webkit-transition-property: left, right;
+  transition-property: left, right;
+  -webkit-transition-duration: 0.3s;
+  transition-duration: 0.3s;
+  -webkit-transition-timing-function: ease-out;
+  transition-timing-function: ease-out;
+}
+.hvr-underline-from-center:hover:before, .hvr-underline-from-center:focus:before, .hvr-underline-from-center:active:before {
+  left: 0;
+  right: 0;
+}
+
 .container-template {
   font-size: 1em;
   width: 256px;
   height: 128px;
-  margin: 10px;
-  padding: 10px;
+  margin: 15px;
+  padding: 5px;
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -233,12 +179,12 @@ input[type="radio"] {
 }
 
 .container-template--selected {
-  background-color: #f6f6f6;
+  background-color: #ececec;
   color: #2d3e63;
 }
 
 .container-template:hover {
-  background-color: #f6f6f6;
+  background-color: #ececec;
   color: #2d3e63;
 }
 
@@ -254,4 +200,5 @@ input[type="radio"] {
 .container-template .description {
   text-align: center;
   font-size: 0.8em;
+  margin-bottom: 5px;
 }

bower.json

@@ -1,9 +1,9 @@
 {
   "name": "portainer",
-  "version": "1.8.0",
-  "homepage": "https://github.com/cloud-inovasi/portainer",
+  "version": "1.10.1",
+  "homepage": "https://github.com/portainer/portainer",
   "authors": [
-    "Anthony Lapenna <anthony.lapenna@cloudinovasi.id>"
+    "Anthony Lapenna <anthony.lapenna at gmail dot com>"
   ],
   "description": "A web interface for the Docker Remote API.",
   "keywords": [
@@ -34,13 +34,13 @@
     "angular-ui-select": "~0.17.1",
     "bootstrap": "~3.3.6",
     "font-awesome": "~4.6.3",
-    "Hover": "2.0.2",
+    "filesize": "~3.3.0",
     "jquery": "1.11.1",
     "jquery.gritter": "1.7.4",
     "lodash": "4.12.0",
     "rdash-ui": "1.0.*",
     "moment": "~2.14.1",
-    "xterm.js": "~1.0.0"
+    "xterm.js": "~2.0.1"
   },
   "resolutions": {
     "angular": "1.5.5"

build.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+VERSION=$1
+
+if [[ $# -ne 1 ]] ; then
+  echo "Usage: $(basename $0) <VERSION>"
+  exit 1
+fi
+
+grunt release
+rm -rf /tmp/portainer-build-unix && mkdir -pv /tmp/portainer-build-unix/portainer
+mv dist/* /tmp/portainer-build-unix/portainer
+cd /tmp/portainer-build-unix && tar cvpfz portainer-${VERSION}-linux-amd64.tar.gz portainer
+cd -
+
+grunt release-win
+rm -rf /tmp/portainer-build-win && mkdir -pv /tmp/portainer-build-win/portainer
+mv dist/* /tmp/portainer-build-win/portainer
+cd /tmp/portainer-build-win
+tar cvpfz portainer-${VERSION}-windows-amd64.tar.gz portainer
+cd -
+
+grunt release-arm
+rm -rf /tmp/portainer-build-arm && mkdir -pv /tmp/portainer-build-arm/portainer
+mv dist/* /tmp/portainer-build-arm/portainer
+cd /tmp/portainer-build-arm
+tar cvpfz portainer-${VERSION}-linux-arm.tar.gz portainer
+cd -
+
+grunt release-macos
+rm -rf /tmp/portainer-build-darwin && mkdir -pv /tmp/portainer-build-darwin/portainer
+mv dist/* /tmp/portainer-build-darwin/portainer
+cd /tmp/portainer-build-darwin
+tar cvpfz portainer-${VERSION}-darwin-amd64.tar.gz portainer
+
+exit 0

build/linux/Dockerfile

@@ -4,6 +4,8 @@ COPY dist /
 
 VOLUME /data
 
+WORKDIR /
+
 EXPOSE 9000
 
 ENTRYPOINT ["/portainer"]

build/windows/microsoftservercore/Dockerfile

@@ -0,0 +1,9 @@
+FROM microsoft/windowsservercore
+
+COPY dist /
+
+WORKDIR /
+
+EXPOSE 9000
+
+ENTRYPOINT ["/portainer.exe"]

build/windows/nanoserver/Dockerfile

@@ -0,0 +1,9 @@
+FROM microsoft/nanoserver
+
+COPY dist /
+
+WORKDIR /
+
+EXPOSE 9000
+
+ENTRYPOINT ["/portainer.exe"]

examples/nginx-basic-auth/Dockerfile

@@ -1,4 +0,0 @@
-FROM nginx:latest
-
-COPY default.conf /etc/nginx/conf.d/default.conf
-COPY users.htpasswd /etc/nginx/users.htpasswd

examples/nginx-basic-auth/default.conf

@@ -1,17 +0,0 @@
-upstream portainer {
-    server portainer:9000;
-}
-
-server {
-    listen       80;
-    server_name  localhost;
-
-    location / {
-        auth_basic "Docker UI";
-        auth_basic_user_file  /etc/nginx/users.htpasswd;
-
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-        proxy_pass http://portainer;
-    }
-}

examples/nginx-basic-auth/docker-compose.yml

@@ -1,10 +0,0 @@
-portainer:
-  image: cloudinovasi/portainer
-  command: -e http://<SWARM_HOST>:<SWARM_PORT>
-
-nginx:
-  build: .
-  links:
-   - portainer
-  ports:
-   - 80:80

examples/nginx-basic-auth/users.htpasswd

@@ -1 +0,0 @@
-user:{PLAIN}password

gruntFile.js

@@ -16,7 +16,7 @@ module.exports = function (grunt) {
     grunt.registerTask('default', ['jshint', 'build', 'karma:unit']);
     grunt.registerTask('build', [
         'clean:app',
-        'if:binaryNotExist',
+        'if:unixBinaryNotExist',
         'html2js',
         'concat',
         'clean:tmpl',
@@ -25,7 +25,43 @@ module.exports = function (grunt) {
     ]);
     grunt.registerTask('release', [
         'clean:all',
-        'if:binaryNotExist',
+        'if:unixBinaryNotExist',
+        'html2js',
+        'uglify',
+        'clean:tmpl',
+        'jshint',
+        //'karma:unit',
+        'concat:index',
+        'recess:min',
+        'copy'
+    ]);
+    grunt.registerTask('release-win', [
+        'clean:all',
+        'if:windowsBinaryNotExist',
+        'html2js',
+        'uglify',
+        'clean:tmpl',
+        'jshint',
+        //'karma:unit',
+        'concat:index',
+        'recess:min',
+        'copy'
+    ]);
+    grunt.registerTask('release-arm', [
+        'clean:all',
+        'if:unixArmBinaryNotExist',
+        'html2js',
+        'uglify',
+        'clean:tmpl',
+        'jshint',
+        //'karma:unit',
+        'concat:index',
+        'recess:min',
+        'copy'
+    ]);
+    grunt.registerTask('release-macos', [
+        'clean:all',
+        'if:darwinBinaryNotExist',
         'html2js',
         'uglify',
         'clean:tmpl',
@@ -37,10 +73,11 @@ module.exports = function (grunt) {
     ]);
     grunt.registerTask('lint', ['jshint']);
     grunt.registerTask('test-watch', ['karma:watch']);
-    grunt.registerTask('run', ['if:binaryNotExist', 'build', 'shell:buildImage', 'shell:run']);
-    grunt.registerTask('run-swarm', ['if:binaryNotExist', 'build', 'shell:buildImage', 'shell:runSwarm', 'watch:buildSwarm']);
-    grunt.registerTask('run-dev', ['if:binaryNotExist', 'shell:buildImage', 'shell:run', 'watch:build']);
-    grunt.registerTask('run-ssl', ['if:binaryNotExist', 'shell:buildImage', 'shell:runSsl', 'watch:buildSsl']);
+    grunt.registerTask('run', ['if:unixBinaryNotExist', 'build', 'shell:buildImage', 'shell:run']);
+    grunt.registerTask('run-swarm', ['if:unixBinaryNotExist', 'build', 'shell:buildImage', 'shell:runSwarm', 'watch:buildSwarm']);
+    grunt.registerTask('run-swarm-local', ['if:unixBinaryNotExist', 'build', 'shell:buildImage', 'shell:runSwarmLocal', 'watch:buildSwarm']);
+    grunt.registerTask('run-dev', ['if:unixBinaryNotExist', 'shell:buildImage', 'shell:run', 'watch:build']);
+    grunt.registerTask('run-ssl', ['if:unixBinaryNotExist', 'shell:buildImage', 'shell:runSsl', 'watch:buildSsl']);
     grunt.registerTask('clear', ['clean:app']);
 
     // Print a timestamp (useful for when watching)
@@ -71,8 +108,9 @@ module.exports = function (grunt) {
                 'bower_components/bootstrap/dist/js/bootstrap.min.js',
                 'bower_components/Chart.js/Chart.min.js',
                 'bower_components/lodash/dist/lodash.min.js',
+                'bower_components/filesize/lib/filesize.min.js',
                 'bower_components/moment/min/moment.min.js',
-                'bower_components/xterm.js/src/xterm.js',
+                'bower_components/xterm.js/dist/xterm.js',
                 'assets/js/jquery.gritter.js', // Using custom version to fix error in minified build due to "use strict"
                 'assets/js/legend.js' // Not a bower package
             ],
@@ -87,8 +125,7 @@ module.exports = function (grunt) {
                 'bower_components/font-awesome/css/font-awesome.min.css',
                 'bower_components/rdash-ui/dist/css/rdash.min.css',
                 'bower_components/angular-ui-select/dist/select.min.css',
-                'bower_components/xterm.js/src/xterm.css',
-                'bower_components/Hover/css/hover-min.css'
+                'bower_components/xterm.js/dist/xterm.css'
             ]
         },
         clean: {
@@ -253,7 +290,7 @@ module.exports = function (grunt) {
         },
         shell: {
             buildImage: {
-                command: 'docker build --rm -t portainer .'
+                command: 'docker build --rm -t portainer -f build/linux/Dockerfile .'
             },
             buildBinary: {
                 command: [
@@ -263,6 +300,30 @@ module.exports = function (grunt) {
                     'mv api/portainer dist/'
                 ].join(' && ')
             },
+            buildUnixArmBinary: {
+                command: [
+                    'docker run --rm -v $(pwd)/api:/src -e BUILD_GOOS="linux" -e BUILD_GOARCH="arm" centurylink/golang-builder-cross',
+                    'shasum api/portainer-linux-arm > portainer-checksum.txt',
+                    'mkdir -p dist',
+                    'mv api/portainer-linux-arm dist/portainer'
+                ].join(' && ')
+            },
+            buildDarwinBinary: {
+                command: [
+                    'docker run --rm -v $(pwd)/api:/src -e BUILD_GOOS="darwin" -e BUILD_GOARCH="amd64" centurylink/golang-builder-cross',
+                    'shasum api/portainer-darwin-amd64 > portainer-checksum.txt',
+                    'mkdir -p dist',
+                    'mv api/portainer-darwin-amd64 dist/portainer'
+                ].join(' && ')
+            },
+            buildWindowsBinary: {
+                command: [
+                    'docker run --rm -v $(pwd)/api:/src -e BUILD_GOOS="windows" -e BUILD_GOARCH="amd64" centurylink/golang-builder-cross',
+                    'shasum api/portainer-windows-amd64 > portainer-checksum.txt',
+                    'mkdir -p dist',
+                    'mv api/portainer-windows-amd64 dist/portainer.exe'
+                ].join(' && ')
+            },
             run: {
                 command: [
                     'docker stop portainer',
@@ -274,9 +335,16 @@ module.exports = function (grunt) {
                 command: [
                     'docker stop portainer',
                     'docker rm portainer',
-                    'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:4000 --swarm -d /data'
+                    'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:2375 --swarm -d /data'
                 ].join(';')
             },
+            runSwarmLocal: {
+              command: [
+                  'docker stop portainer',
+                  'docker rm portainer',
+                  'docker run -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name portainer portainer --swarm'
+              ].join(';')
+            },
             runSsl: {
                 command: [
                     'docker stop portainer',
@@ -289,11 +357,29 @@ module.exports = function (grunt) {
             }
         },
         'if': {
-            binaryNotExist: {
-                options: {
-                    executable: 'dist/portainer'
-                },
-                ifFalse: ['shell:buildBinary']
+            unixBinaryNotExist: {
+              options: {
+                  executable: 'dist/portainer'
+              },
+              ifFalse: ['shell:buildBinary']
+            },
+            unixArmBinaryNotExist: {
+              options: {
+                  executable: 'dist/portainer'
+              },
+              ifFalse: ['shell:buildUnixArmBinary']
+            },
+            darwinBinaryNotExist: {
+              options: {
+                  executable: 'dist/portainer'
+              },
+              ifFalse: ['shell:buildDarwinBinary']
+            },
+            windowsBinaryNotExist: {
+              options: {
+                  executable: 'dist/portainer.exe'
+              },
+              ifFalse: ['shell:buildWindowsBinary']
             }
         }
     });

index.html

@@ -32,8 +32,8 @@
       <ul class="sidebar">
         <li class="sidebar-main">
           <a ng-click="toggleSidebar()">
-            <img ng-if="config.logo" ng-src="{{ config.logo }}" class="img-responsive logo">
-            <img ng-if="!config.logo" src="images/logo.png" class="img-responsive logo" alt="Portainer">
+            <img ng-if="logo" ng-src="{{ logo }}" class="img-responsive logo">
+            <img ng-if="!logo" src="images/logo.png" class="img-responsive logo" alt="Portainer">
             <span class="menu-icon glyphicon glyphicon-transfer"></span>
           </a>
         </li>
@@ -44,6 +44,9 @@
         <li class="sidebar-list">
           <a ui-sref="templates">App Templates <span class="menu-icon fa fa-rocket"></span></a>
         </li>
+        <li class="sidebar-list" ng-if="swarm_mode">
+          <a ui-sref="services">Services <span class="menu-icon fa fa-list-alt"></span></a>
+        </li>
         <li class="sidebar-list">
           <a ui-sref="containers">Containers <span class="menu-icon fa fa-server"></span></a>
         </li>
@@ -56,19 +59,22 @@
         <li class="sidebar-list">
           <a ui-sref="volumes">Volumes <span class="menu-icon fa fa-cubes"></span></a>
         </li>
-        <li class="sidebar-list" ng-if="!config.swarm">
+        <li class="sidebar-list" ng-if="!swarm">
           <a ui-sref="events">Events <span class="menu-icon fa fa-history"></span></a>
         </li>
-        <li class="sidebar-list" ng-if="config.swarm">
+        <li class="sidebar-list" ng-if="(swarm && !swarm_mode) || (swarm_mode && swarm_manager)">
           <a ui-sref="swarm">Swarm <span class="menu-icon fa fa-object-group"></span></a>
         </li>
-        <li class="sidebar-list" ng-if="!config.swarm">
-          <a ui-sref="docker">Docker <span class="menu-icon fa fa-cogs"></span></a>
+        <li class="sidebar-list" ng-if="!swarm">
+          <a ui-sref="docker">Docker <span class="menu-icon fa fa-th"></span></a>
         </li>
       </ul>
       <div class="sidebar-footer">
         <div class="col-xs-12">
-          <a href="https://github.com/cloud-inovasi/portainer" target="_blank">Portainer {{ uiVersion }}</a>
+          <a href="https://github.com/portainer/portainer" target="_blank">
+            <i class="fa fa-github" aria-hidden="true"></i>
+            Portainer {{ uiVersion }}
+          </a>
         </div>
       </div>
     </div>

package.json

@@ -1,19 +1,19 @@
 {
-  "author": "Cloud Inovasi",
+  "author": "Portainer.io",
   "name": "portainer",
-  "homepage": "https://github.com/cloud-inovasi/portainer",
-  "version": "1.8.0",
+  "homepage": "http://portainer.io",
+  "version": "1.10.1",
   "repository": {
     "type": "git",
-    "url": "git@github.com:cloud-inovasi/portainer.git"
+    "url": "git@github.com:portainer/portainer.git"
   },
   "bugs": {
-    "url": "https://github.com/cloud-inovasi/portainer/issues"
+    "url": "https://github.com/portainer/portainer/issues"
   },
   "licenses": [
     {
       "type": "MIT",
-      "url": "https://raw.githubusercontent.com/cloud-inovasi/portainer/develop/LICENSE"
+      "url": "https://raw.githubusercontent.com/portainer/portainer/develop/LICENSE"
     }
   ],
   "engines": {

test/unit/app/shared/filters.spec.js

@@ -82,32 +82,6 @@ describe('filters', function () {
         }));
     });
 
-    describe('humansize', function () {
-        it('should return n/a when size is zero', inject(function (humansizeFilter) {
-            expect(humansizeFilter(0)).toBe('n/a');
-        }));
-
-        it('should handle Bytes values', inject(function (humansizeFilter) {
-            expect(humansizeFilter(512)).toBe('512 Bytes');
-        }));
-
-        it('should handle KB values', inject(function (humansizeFilter) {
-            expect(humansizeFilter(5 * 1024)).toBe('5 KB');
-        }));
-
-        it('should handle MB values', inject(function (humansizeFilter) {
-            expect(humansizeFilter(5 * 1024 * 1024)).toBe('5.0 MB');
-        }));
-
-        it('should handle GB values', inject(function (humansizeFilter) {
-            expect(humansizeFilter(5 * 1024 * 1024 * 1024)).toBe('5.00 GB');
-        }));
-
-        it('should handle TB values', inject(function (humansizeFilter) {
-            expect(humansizeFilter(5 * 1024 * 1024 * 1024 * 1024)).toBe('5.000 TB');
-        }));
-    });
-
     describe('containername', function () {
         it('should strip the leading slash from container name', inject(function (containernameFilter) {
             var container = {