From 2f5c9ecba5963e0199f061fa4cfb07d7e0147390 Mon Sep 17 00:00:00 2001
From: volodymyr-babak <volodymyr.babak@gmail.com>
Date: Wed, 17 May 2017 12:08:10 +0300
Subject: [PATCH] improved docker makefiles

---
 docker/cassandra/Makefile             | 6 +-----
 docker/thingsboard-db-schema/Makefile | 8 ++++----
 docker/thingsboard/Makefile           | 6 ++----
 docker/zookeeper/Makefile             | 4 ----
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile
index ea71c6340c..cb577cb502 100644
--- a/docker/cassandra/Makefile
+++ b/docker/cassandra/Makefile
@@ -2,12 +2,8 @@ VERSION=k8stest
 PROJECT=thingsboard
 APP=cassandra
 
-all: build
-
 build:
 	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
 
 push: build
-	docker push ${PROJECT}/${APP}:${VERSION}
-
-.PHONY: all build push
\ No newline at end of file
+	docker push ${PROJECT}/${APP}:${VERSION}
\ No newline at end of file
diff --git a/docker/thingsboard-db-schema/Makefile b/docker/thingsboard-db-schema/Makefile
index 653153940f..ef526e1a6a 100644
--- a/docker/thingsboard-db-schema/Makefile
+++ b/docker/thingsboard-db-schema/Makefile
@@ -2,12 +2,12 @@ VERSION=k8stest
 PROJECT=thingsboard
 APP=thingsboard-db-schema
 
-all: build
-
 build:
+	cp ../../dao/src/main/resources/schema.cql .
+	cp ../../dao/src/main/resources/demo-data.cql .
+	cp ../../dao/src/main/resources/system-data.cql .
 	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
 
 push: build
 	docker push ${PROJECT}/${APP}:${VERSION}
-
-.PHONY: all build push
\ No newline at end of file
+	rm schema.cql demo-data.cql system-data.cql
\ No newline at end of file
diff --git a/docker/thingsboard/Makefile b/docker/thingsboard/Makefile
index 29203e30d3..72ada4d0f7 100644
--- a/docker/thingsboard/Makefile
+++ b/docker/thingsboard/Makefile
@@ -2,12 +2,10 @@ VERSION=k8stest
 PROJECT=thingsboard
 APP=application
 
-all: build
-
 build:
+	cp ../../application/target/thingsboard.deb .
 	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
 
 push: build
 	docker push ${PROJECT}/${APP}:${VERSION}
-
-.PHONY: all build push
\ No newline at end of file
+	rm thingsboard.deb
\ No newline at end of file
diff --git a/docker/zookeeper/Makefile b/docker/zookeeper/Makefile
index 4c7a8c4007..b179f07291 100644
--- a/docker/zookeeper/Makefile
+++ b/docker/zookeeper/Makefile
@@ -2,12 +2,8 @@ VERSION=k8stest
 PROJECT=thingsboard
 APP=zk
 
-all: build
-
 build:
 	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
 
 push: build
 	docker push ${PROJECT}/${APP}:${VERSION}
-
-.PHONY: all build push