Merge branch 'master' of https://github.com/gaia-docker/example-voting-app to local

Author: ngehani

swarm/0_swarm_cluster_mac.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# vars
+NUM_WORKERS=3
+[ -z "$NUM_WORKERS" ] && NUM_WORKERS=3
+
+# init Swarm master
+docker swarm init
+
+# get join token
+SWARM_TOKEN=$(docker swarm join-token -q worker)
+
+# get Swarm master IP (Docker for Mac xhyve VM IP)
+SWARM_MASTER=$(docker info | grep -w 'Node Address' | awk '{print $3}')
+sleep 5
+
+# run NUM_WORKERS workers with SWARM_TOKEN
+for i in $(seq "${NUM_WORKERS}"); do
+  docker run -d --privileged --name worker-${i} --hostname=worker-${i} -p ${i}2375:2375 docker:1.12.1-dind
+  docker --host=localhost:${i}2375 swarm join --token ${SWARM_TOKEN} ${SWARM_MASTER}:2377
+done
+
+# show swarm cluster
+echo "Local Swarm Cluster"
+echo "==================="
+
+docker node ls

swarm/1_deploy.sh

@@ -16,43 +16,43 @@ if [ $? -ne 0 ]; then
 fi
 
 # create network, if not exists
-docker network ls --filter "name=${DEMO_NET}" | grep "${DEMO_NET}"
+docker network ls --filter "name=${DEMO_NET}" | grep -w "${DEMO_NET}"
 if [ $? -ne 0 ]; then
   docker network create --driver overlay --subnet 10.20.0.1/24 ${DEMO_NET}
 fi
 
 # create database volumes
-docker volume ls --filter "name=db-data" | grep "db-data"
+docker volume ls --filter "name=${DEMO_DB_VOL}" | grep -w "${DEMO_DB_VOL}"
 if [ $? -ne 0 ]; then
   docker volume create --name ${DEMO_DB_VOL}
 fi
 
 # create postgresql service
-docker service ls --filter "name=db" | grep "db"
+docker service ls --filter "name=db" | grep -w "db"
 if [ $? -ne 0 ]; then
   docker service create --name db --network ${DEMO_NET} --mount type=volume,source=${DEMO_DB_VOL},target=/var/lib/postgresql/data postgres:9.4
 fi
 
 # create redis service
-docker service ls --filter "name=redis" | grep "redis"
+docker service ls --filter "name=redis" | grep -w "redis"
 if [ $? -ne 0 ]; then
   docker service create --name redis --network ${DEMO_NET} redis:3.2-alpine
 fi
 
 # create voting-app
-docker service ls --filter "name=voting-app" | grep "voting-app"
+docker service ls --filter "name=voting-app" | grep -w "voting-app"
 if [ $? -ne 0 ]; then
   docker service create --name voting-app --network ${DEMO_NET} --publish 5000:80 ${DEMO_REP}/example-voting-app-vote:${VOTE_TAG_GOOD}
 fi
 
 # create result-app
-docker service ls --filter "name=result-app" | grep "result-app"
+docker service ls --filter "name=result-app" | grep -w "result-app"
 if [ $? -ne 0 ]; then
   docker service create --name result-app --network ${DEMO_NET} --publish 5001:80 ${DEMO_REP}/example-voting-app-result:${DEMO_TAG}
 fi
 
 # create worker-app
-docker service ls --filter "name=worker" | grep "worker"
+docker service ls --filter "name=worker" | grep -w "worker"
 if [ $? -ne 0 ]; then
   docker service create --name worker --network ${DEMO_NET} ${DEMO_REP}/example-voting-app-worker:${DEMO_TAG}
 fi