last commit before M|17 Conference

Author: bstaijen

docker-compose-registrator.yml

@@ -0,0 +1,36 @@
+version: '2'
+
+services:
+    registrator:
+        image: gliderlabs/registrator:v7
+        depends_on: 
+            - consul
+        hostname: registrator
+        volumes:
+        - "/var/run/docker.sock:/tmp/docker.sock"
+        command: -internal consul://consul:8500
+        restart: always
+        environment:
+        - "affinity:com.mariadb.host!=registrator"
+        labels:
+        - "com.mariadb.host=registrator"
+    consul:
+        image: "progrium/consul:latest"
+        hostname: "consul"
+        ports:
+        - "8400:8400"
+        - "8500:8500"
+        - "8600:53/udp"
+        command: "-server -bootstrap -ui-dir /ui"
+        restart: always
+    vizualizer:
+        image: bstaijen/mariadb-microservice-vizualizersvc:demo
+        ports:
+        - 3000:3000
+        environment:
+        - SWARM_HOST
+        - SWARM_CA
+        - SWARM_KEY
+        - SWARM_CERT
+        - "constraint:node==master"
+        restart: always

docker-compose.yml

@@ -24,8 +24,6 @@ services:
         - "com.mariadb.host=webserver"
     authentication:
         image: bstaijen/mariadb-microservice-authenticationsvc:demo
-        depends_on: 
-            - registrator
         ports:
             - "5001:5001"
         restart: always 
@@ -42,8 +40,6 @@ services:
         - "com.mariadb.host=authenticationsvc"
     photo:
         image: bstaijen/mariadb-microservice-photosvc:demo
-        depends_on: 
-            - registrator
         ports:
             - "5002:5002"
         restart: always 
@@ -62,9 +58,7 @@ services:
         labels:
         - "com.mariadb.host=photosvc"
     vote:
-        image: bstaijen/mariadb-microservice-votesvc:demo
-        depends_on: 
-            - registrator
+        image: bstaijen/mariadb-microservice-voteservice:demo
         ports:
             - "5003:5003"
         restart: always
@@ -81,9 +75,7 @@ services:
         labels:
         - "com.mariadb.host=votesvc"
     comment:
-        image: bstaijen/mariadb-microservice-commentsvc:demo3
-        depends_on: 
-            - registrator
+        image: bstaijen/mariadb-microservice-commentsvc:demo
         ports:
             - "5004:5004"
         restart: always
@@ -103,8 +95,6 @@ services:
         - "com.mariadb.host=commentsvc"
     profile:
         image: bstaijen/mariadb-microservice-profilesvc:demo
-        depends_on: 
-            - registrator
         ports:
             - "5000:5000"
         restart: always
@@ -121,8 +111,6 @@ services:
         - "com.mariadb.host=profilesvc"
     db:
         image: bstaijen/mariadb-microservice-database:demo
-        depends_on: 
-            - registrator
         restart: always
         environment:
         - "MYSQL_ROOT_PASSWORD=password"
@@ -137,36 +125,4 @@ services:
         - 3306:3306
         - 4567-4568:4567-4568
         - 4444:4444
-    registrator:
-        image: gliderlabs/registrator:v7
-        depends_on: 
-            - consul
-        hostname: registrator
-        volumes:
-        - "/var/run/docker.sock:/tmp/docker.sock"
-        command: -internal consul://consul:8500
-        restart: always
-        environment:
-        - "affinity:com.mariadb.host!=registrator"
-        labels:
-        - "com.mariadb.host=registrator"
-    consul:
-        image: "progrium/consul:latest"
-        hostname: "consul"
-        ports:
-        - "8400:8400"
-        - "8500:8500"
-        - "8600:53/udp"
-        command: "-server -bootstrap -ui-dir /ui"
-        restart: always
-    vizualizer:
-        image: bstaijen/mariadb-microservice-vizualizersvc:demo
-        ports:
-        - 3000:3000
-        environment:
-        - SWARM_HOST
-        - SWARM_CA
-        - SWARM_KEY
-        - SWARM_CERT
-        - "constraint:node==master"
-        restart: always
+    

run.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+SWARM_MACHINE_NAME=master
+CERT_PATH=~/.docker/machine/machines/$SWARM_MACHINE_NAME
+export SWARM_CA=$(cat $CERT_PATH/ca.pem)
+export SWARM_CERT=$(cat $CERT_PATH/cert.pem)
+export SWARM_KEY=$(cat $CERT_PATH/key.pem)
+export SWARM_HOST=tcp://$(docker-machine ip $SWARM_MACHINE_NAME):3376
+
+# Start running containers in the cluster and make 
+# sure that registrator is running on each of them
+docker-compose up -d --force-recreate
+docker-compose scale registrator=3

scripts/build.sh

@@ -7,4 +7,6 @@ docker build -t authenticationsvc ../authentication-service
 docker build -t photosvc ../photo-service
 docker build -t votesvc ../vote-service
 docker build -t commentsvc ../comment-service
-docker build -t profilesvc ../profile-service
+docker build -t profilesvc ../profile-service
+docker build -t vizualizersvc ../vizualizer
+docker build -t db ../database

scripts/create_swarm.sh

@@ -24,7 +24,7 @@ docker-machine create \
     --engine-opt="cluster-advertise=eth1:2376" master
 
 # Create 4 nodes
-for N in 0 1 2 3; do 
+for N in 0 1; do 
     docker-machine create \
         --driver virtualbox \
         --virtualbox-memory 512 \

scripts/run.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+SWARM_MACHINE_NAME=master
+CERT_PATH=~/.docker/machine/machines/$SWARM_MACHINE_NAME
+export SWARM_CA=$(cat $CERT_PATH/ca.pem)
+export SWARM_CERT=$(cat $CERT_PATH/cert.pem)
+export SWARM_KEY=$(cat $CERT_PATH/key.pem)
+export SWARM_HOST=tcp://$(docker-machine ip $SWARM_MACHINE_NAME):3376
+
+# Start running containers in the cluster and make 
+# sure that registrator is running on each of them
+docker-compose -f docker-compose-registrator.yml up -d
+docker-compose -f docker-compose-registrator.yml scale registrator=3

start_registrator.sh

@@ -89,8 +89,7 @@ func GetVotesFromAUser(connection *sql.DB, cnf config.Config) negroni.HandlerFun
 		}
 
 		if len(queryToken) < 1 {
-			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte(string("token is mandatory")))
+			util.SendErrorMessage(w, "Token is mandatory")
 			return
 		}
 
@@ -105,7 +104,7 @@ func GetVotesFromAUser(connection *sql.DB, cnf config.Config) negroni.HandlerFun
 		}
 
 		claims := tok.Claims.(jwt.MapClaims)
-		var ID = claims["sub"].(float64) // gets the ID
+		var ID = claims["sub"].(float64) // gets the UserID
 
 		// get offset and rows
 		offset, rows := helper.PaginationFromRequest(r)
@@ -118,7 +117,6 @@ func GetVotesFromAUser(connection *sql.DB, cnf config.Config) negroni.HandlerFun
 
 		photos := getPhotos(cnf, photoIDs)
 
-		// TODO : put this in a method.
 		t := make([]*sharedModels.HasVotedRequest, 0)
 		g := make([]*sharedModels.VoteCountRequest, 0)
 		for _, v := range photos {