From 49d4c5800fd88512eace31e652d161e10dfc30c4 Mon Sep 17 00:00:00 2001 From: Kevan Ahlquist Date: Sun, 24 Jan 2016 17:03:20 -0600 Subject: [PATCH] Added swarm on docker-machine example. --- examples/swarm/Dockerfile | 3 +++ examples/swarm/README.md | 11 +++++++++++ examples/swarm/docker-compose.yml | 11 +++++++++++ gruntFile.js | 8 ++++++++ 4 files changed, 33 insertions(+) create mode 100644 examples/swarm/Dockerfile create mode 100644 examples/swarm/README.md create mode 100644 examples/swarm/docker-compose.yml diff --git a/examples/swarm/Dockerfile b/examples/swarm/Dockerfile new file mode 100644 index 0000000..9d6bbe5 --- /dev/null +++ b/examples/swarm/Dockerfile @@ -0,0 +1,3 @@ +FROM debian + +RUN apt-get update && apt-get install -y socat diff --git a/examples/swarm/README.md b/examples/swarm/README.md new file mode 100644 index 0000000..9a15bbe --- /dev/null +++ b/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 +``` diff --git a/examples/swarm/docker-compose.yml b/examples/swarm/docker-compose.yml new file mode 100644 index 0000000..8721ea5 --- /dev/null +++ b/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 diff --git a/gruntFile.js b/gruntFile.js index 605539f..db252e9 100644 --- a/gruntFile.js +++ b/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)' }