thingsboard-memoizeit

improved docker makefiles

5/17/2017 6:08:10 AM

volodymyr-babak

Commit: 2f5c9ec

Tree: 23b8abb

Parents: 17a7610

Changes

docker/cassandra/Makefile 6(+1 -5)

docker/thingsboard/Makefile 6(+2 -4)

docker/thingsboard-db-schema/Makefile 8(+4 -4)

docker/zookeeper/Makefile 4(+0 -4)

Details

docker/cassandra/Makefile 6(+1 -5)

diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile
index ea71c63..cb577cb 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

docker/thingsboard/Makefile 6(+2 -4)

diff --git a/docker/thingsboard/Makefile b/docker/thingsboard/Makefile
index 29203e3..72ada4d 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

docker/thingsboard-db-schema/Makefile 8(+4 -4)

diff --git a/docker/thingsboard-db-schema/Makefile b/docker/thingsboard-db-schema/Makefile
index 6531539..ef526e1 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

docker/zookeeper/Makefile 4(+0 -4)

diff --git a/docker/zookeeper/Makefile b/docker/zookeeper/Makefile
index 4c7a8c4..b179f07 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