Merge pull request #9 from microservices-demo/catalogue-db

Adding catalogue db image to replace base mysql.

Makefile

@@ -1,4 +1,8 @@
 NAME = weaveworksdemos/catalogue
+DBNAME = weaveworksdemos/catalogue-db
+
+TAG=$(TRAVIS_COMMIT)
+
 INSTANCE = catalogue
 
 .PHONY: default build copy
@@ -18,3 +22,9 @@ release:
 
 run:
 	docker run --rm -p 8080:80 --name $(INSTANCE) $(NAME)
+
+dockertravisbuild: build
+	docker build -t $(NAME):$(TAG) -f docker/catalogue/Dockerfile-release docker/catalogue/
+	docker build -t $(DBNAME):$(TAG) -f docker/catalogue-db/Dockerfile docker/catalogue-db/
+	docker login -u $(DOCKER_USER) -p $(DOCKER_PASS)
+	scripts/push.sh

docker/catalogue-db/Dockerfile

@@ -0,0 +1,8 @@
+FROM mysql:5.7
+
+# ENV MYSQL_ROOT_PASSWORD DEFAULT_PASS
+# ENV MYSQL_ALLOW_EMPTY_PASSWORD=true
+# ENV MYSQL_DATABASE=socksdb
+
+COPY ./data/dump.sql /docker-entrypoint-initdb.d/
+

docker/catalogue/Dockerfile

@@ -2,7 +2,7 @@ FROM golang:1.6
 
 RUN mkdir /app
 COPY . /go/src/github.com/microservices-demo/catalogue/
-COPY images/ /app/images/
+COPY images/ /images/
 
 RUN go get github.com/gorilla/mux github.com/go-kit/kit/log github.com/go-kit/kit/endpoint github.com/go-kit/kit/transport/http github.com/go-sql-driver/mysql github.com/jmoiron/sqlx github.com/go-kit/kit/metrics/prometheus github.com/prometheus/client_golang/prometheus
 

scripts/build.sh

@@ -41,3 +41,7 @@ $DOCKER_CMD build \
   --build-arg COMMIT=$COMMIT \
   -t ${REPO}:${COMMIT} \
   -f $CODE_DIR/docker/catalogue/Dockerfile-release $CODE_DIR/docker/catalogue;
+
+$DOCKER_CMD build \
+  -t ${REPO}-db:${COMMIT} \
+  -f $CODE_DIR/docker/catalogue-db/Dockerfile $CODE_DIR/docker/catalogue-db;