From d04b631d6cb976402b204428b4a80f54a6aaab1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clc@cloud-temple.com>
Date: Thu, 15 Jun 2017 22:00:08 +0200
Subject: [PATCH 1/2] add bench disk volume for bench shared volume

---
 README.md          |  7 +++++++
 docker-compose.yml | 13 +++++++++++++
 server/server.js   |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 docker-compose.yml

diff --git a/README.md b/README.md
index 0047009..09d53d7 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ docker run -d \
 -p 80:80 \
 -p 5001:5001 \
 --name=simple-container-benchmarks-server \
+-v ${PWD}/bench:/benchmarks \
 misterbisson/simple-container-benchmarks
 ```
 
@@ -104,3 +105,9 @@ Using the Docker API as the directory for service discovery works well if the co
 ```
 docker build -t misterbisson/simple-container-benchmarks .
 ```
+
+### Swarm mode
+
+```
+docker stack deploy -c docker-compose.yml bench
+```
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..9bd372b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '3'
+services :
+  web-bench:
+    image: cl3m3nt/simple-container-benchmarks 
+    ports:
+      - 80:80
+    volumes:
+        - data:/benchmarks
+    deploy:
+      mode: replicated
+      replicas: 1
+volumes:
+   data:
diff --git a/server/server.js b/server/server.js
index 475eb23..d64a349 100644
--- a/server/server.js
+++ b/server/server.js
@@ -5,7 +5,7 @@ var exec = require('shelljs').exec;
 server.get('/disk', disk);
 function disk(req, res, next) {
 	console.log('/disk request');
-	var thing = exec("(dd bs=1M count=1024 if=/dev/zero of=/simple-container-benchmarks-writetest conv=fdatasync) 2>&1 | tail -1 | sed -e 's/^ *//' -e 's/ *$//'", {silent:true}).output;
+	var thing = exec("(dd bs=1M count=1024 if=/dev/zero of=/benchmarks/simple-container-benchmarks-writetest conv=fdatasync) 2>&1 | tail -1 | sed -e 's/^ *//' -e 's/ *$//'", {silent:true}).output;
 	exec("rm /simple-container-benchmarks-writetest", {silent:true}).output;
 
 	console.log(thing);

From 5aa279cf6ed284b416cea213c231778b5f41fc15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clc@cloud-temple.com>
Date: Thu, 15 Jun 2017 22:00:08 +0200
Subject: [PATCH 2/2] add bench disk volume for bench shared volume

---
 README.md           |  7 +++++++
 docker-compose.yml  | 13 +++++++++++++
 server/package.json |  4 ++--
 server/server.js    |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/README.md b/README.md
index 0047009..09d53d7 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ docker run -d \
 -p 80:80 \
 -p 5001:5001 \
 --name=simple-container-benchmarks-server \
+-v ${PWD}/bench:/benchmarks \
 misterbisson/simple-container-benchmarks
 ```
 
@@ -104,3 +105,9 @@ Using the Docker API as the directory for service discovery works well if the co
 ```
 docker build -t misterbisson/simple-container-benchmarks .
 ```
+
+### Swarm mode
+
+```
+docker stack deploy -c docker-compose.yml bench
+```
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..9bd372b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '3'
+services :
+  web-bench:
+    image: cl3m3nt/simple-container-benchmarks 
+    ports:
+      - 80:80
+    volumes:
+        - data:/benchmarks
+    deploy:
+      mode: replicated
+      replicas: 1
+volumes:
+   data:
diff --git a/server/package.json b/server/package.json
index 21a29c1..83c9073 100644
--- a/server/package.json
+++ b/server/package.json
@@ -7,7 +7,7 @@
     "start": "node server.js"
   },
   "dependencies": {
-    "restify": "*",
-    "shelljs": "*"
+    "restify": "4.0.3",
+    "shelljs": "0.5.3"
   }
 }
diff --git a/server/server.js b/server/server.js
index 475eb23..d64a349 100644
--- a/server/server.js
+++ b/server/server.js
@@ -5,7 +5,7 @@ var exec = require('shelljs').exec;
 server.get('/disk', disk);
 function disk(req, res, next) {
 	console.log('/disk request');
-	var thing = exec("(dd bs=1M count=1024 if=/dev/zero of=/simple-container-benchmarks-writetest conv=fdatasync) 2>&1 | tail -1 | sed -e 's/^ *//' -e 's/ *$//'", {silent:true}).output;
+	var thing = exec("(dd bs=1M count=1024 if=/dev/zero of=/benchmarks/simple-container-benchmarks-writetest conv=fdatasync) 2>&1 | tail -1 | sed -e 's/^ *//' -e 's/ *$//'", {silent:true}).output;
 	exec("rm /simple-container-benchmarks-writetest", {silent:true}).output;
 
 	console.log(thing);