Merge latest from master and bump version to 0.9.0.

app/app.js

@@ -72,4 +72,4 @@ angular.module('dockerui', [
     // You need to set this to the api endpoint without the port i.e. http://192.168.1.9
     .constant('DOCKER_ENDPOINT', 'dockerapi')
     .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('UI_VERSION', 'v0.9.0-beta');
+    .constant('UI_VERSION', 'v0.9.0');

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "dockerui",
-  "version": "0.9.0-beta",
+  "version": "0.9.0",
   "homepage": "https://github.com/crosbymichael/dockerui",
   "authors": [
     "Michael Crosby <[email protected]>",

examples/swarm/Dockerfile

@@ -0,0 +1,3 @@
+FROM debian
+
+RUN apt-get update && apt-get install -y socat

examples/swarm/README.md

@@ -0,0 +1,11 @@
+# DockerUI with Swarm
+
+This example works with swarm clusters created with docker-machine.
+
+## Usage
+
+Make sure your client is pointed directly to the Docker daemon on the swarm-master's node (not through swarm).
+
+```
+docker-compose up -d
+```

examples/swarm/docker-compose.yml

@@ -0,0 +1,11 @@
+dockerui:
+  image: dockerui/dockerui
+  command: -e http://127.0.0.1:2375
+  net: "host"
+
+socat:
+  build: .
+  net: "host"
+  command: socat -d -d TCP-L:2375,fork,bind=localhost ssl:127.0.0.1:3376,cert=/var/lib/boot2docker/server.pem,cafile=/var/lib/boot2docker/ca.pem,key=/var/lib/boot2docker/server-key.pem
+  volumes:
+    - /var/lib/boot2docker:/var/lib/boot2docker

gruntFile.js

@@ -37,6 +37,7 @@ module.exports = function (grunt) {
     ]);
     grunt.registerTask('test-watch', ['karma:watch']);
     grunt.registerTask('run', ['if:binaryNotExist', 'build', 'shell:buildImage', 'shell:run']);
+    grunt.registerTask('runSwarm', ['if:binaryNotExist', 'build', 'shell:buildImage', 'shell:runSwarm']);
     grunt.registerTask('run-dev', ['if:binaryNotExist', 'shell:buildImage', 'shell:run', 'watch:build']);
 
     // Print a timestamp (useful for when watching)
@@ -259,6 +260,13 @@ module.exports = function (grunt) {
                     'docker run --privileged -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name dockerui dockerui'
                 ].join(';')
             },
+            runSwarm: {
+                command: [
+                    'docker stop dockerui',
+                    'docker rm dockerui',
+                    'docker run --net=host -d --name dockerui dockerui -e http://127.0.0.1:2374'
+                ].join(';')
+            },
             cleanImages: {
                 command: 'docker rmi $(docker images -q -f dangling=true)'
             }

package.json

@@ -2,7 +2,7 @@
   "author": "Michael Crosby & Kevan Ahlquist",
   "name": "dockerui",
   "homepage": "https://github.com/crosbymichael/dockerui",
-  "version": "0.9.0-beta",
+  "version": "0.9.0",
   "repository": {
     "type": "git",
     "url": "[email protected]:crosbymichael/dockerui.git"