From 487fcfa26fcd46306eb89b59b861ac052b245a9b Mon Sep 17 00:00:00 2001
From: Gianluca Arbezzano <gianarb92@gmail.com>
Date: Tue, 8 Aug 2017 22:10:41 +0200
Subject: [PATCH] Fixed Travis and CI

---
 .travis.yml                     | 2 +-
 contrib/swarm/Makefile          | 3 +--
 contrib/swarm/README.md         | 6 +++---
 contrib/swarm/cluster/create.sh | 1 -
 contrib/swarm/stack.yml         | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a60385b..b6304bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ script:
 after_success:
   - docker login -u $DOCKER_USER -p $DOCKER_PASS
   - export REPO=gianarb/orbiter
-  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; then docker build -f Dockerfile -t $REPO . && docker push $REPO; else echo "I only push from master branch." ; fi
+  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; then docker build -f Dockerfile.image -t $REPO . && docker push $REPO; else echo "I only push from master branch." ; fi
 env:
   global:
     - secure: "MN7hNDnx47U9ZCg78GjEGDH5//lLfVzCKnJyPdT4jpYWM05pDB1rPrNwIPZOVuz4XT/x07Oa5M695Pkt61L+yVVfs+AUN6bYwffKWRU0T1dvXzJneB64JQeIGkqyiAHAmrjlpgzOgfB7EcmH4aEFq1HXYCqrvIgAX75D9l/T3xuRXdIzyVLzD3CZZQSZK5cFT37niofMvHoJgmBg5u8FEd2yR2M2LJGbIpXuB3UOn2yqRZHELVg12zhOwgqE+sQtqzBwirx9GObo5x4Nh7AWHIEN/K4BsxMXwZcWSySb0QxRtPpeyiItdDNr62W2MHpyEy//0sJwC5FFhsBzGfSlLpTV+YPrmaXju81JddQVyaB7l6gR3qnwrEywlLBSU3K71FJTHerq23KQV5p50JKA0oYAkKzDtaj0yJAXpFXZbXQq1cOVQidz7Suhi5ZsobI1bzWb5gELCeqCXr0aweTQXqch7Uom4qhIf6aK961F5dvUubzYcgKqbGRBp2F72rls2+9AvnQwUHnPC574sv88oTj0JrDDZoku4vBqSgNkOOICtekBNnksAZLbWasom/+ksqGyZX8qlbf1LLfhwVLqdFgWXrHggO8r8rh8i9MyON0K04hnTHsPHU8+kmbtzZwbXwnVmrJlWnlpolt5CT5XbaPpPwDxvoYsKx0WoYsmZ20="
diff --git a/contrib/swarm/Makefile b/contrib/swarm/Makefile
index 277f30e..20a6516 100644
--- a/contrib/swarm/Makefile
+++ b/contrib/swarm/Makefile
@@ -2,7 +2,7 @@ IP = $(shell docker-machine ip sw1)
 init:
 	./cluster/create.sh
 destroy:
-	docker-machine rm -f sw1 sw2 sw3 sw4
+	docker-machine rm -f sw1 sw2 sw3
 deploy:
 	docker stack deploy --compose-file stack.yml stack
 ps:
@@ -12,4 +12,3 @@ scale-up:
 	curl -X POST -v http://$(IP):8081/handle/autodetect_swarm/stack_micro/up
 scale-down:
 	curl -X POST -v http://$(IP):8081/handle/autodetect_swarm/stack_micro/down
-
diff --git a/contrib/swarm/README.md b/contrib/swarm/README.md
index 1eccfae..f82ac5f 100644
--- a/contrib/swarm/README.md
+++ b/contrib/swarm/README.md
@@ -6,7 +6,7 @@ Requirements:
 * Docker Machine
 * Virtualbox
 
-1. Create a swarm cluster with 4 nodes. One manager and three workers. It uses
+1. Create a swarm cluster with 3 nodes. One manager and two workers. It uses
    Docker Machine and Virtualbox as provider.
 ```
 make init
@@ -27,7 +27,7 @@ make deploy
 
 4. This command shows the current situation. The first table represent the
    number of services and how many task are running under a service. You should
-   see two services. Micro has 10 tasks.
+   see two services. Micro has 3 tasks.
 
 ```
 make ps
@@ -47,7 +47,7 @@ make scale-down
 make ps
 ```
 
-7. At the end of the test you can clean your envrionment
+7. At the end of the test you can clean your environment
 
 ```
 make destroy
diff --git a/contrib/swarm/cluster/create.sh b/contrib/swarm/cluster/create.sh
index d55919b..a5d339a 100755
--- a/contrib/swarm/cluster/create.sh
+++ b/contrib/swarm/cluster/create.sh
@@ -5,7 +5,6 @@ echo "### Init Servers ###"
 docker-machine create -d ${provider} sw1 &
 docker-machine create -d ${provider} sw2 &
 docker-machine create -d ${provider} sw3 &
-docker-machine create -d ${provider} sw4 &
 
 wait
 
diff --git a/contrib/swarm/stack.yml b/contrib/swarm/stack.yml
index b774eef..9fd8172 100644
--- a/contrib/swarm/stack.yml
+++ b/contrib/swarm/stack.yml
@@ -29,7 +29,7 @@ services:
       - 8000:8000
     deploy:
       mode: replicated
-      replicas: 10
+      replicas: 3
       labels: [orbiter=true]
       update_config:
         parallelism: 2