Commit 2f5c9ecba5963e0199f061fa4cfb07d7e0147390

Authored by volodymyr-babak
1 parent 17a7610f

improved docker makefiles

@@ -2,12 +2,8 @@ VERSION=k8stest @@ -2,12 +2,8 @@ VERSION=k8stest
2 PROJECT=thingsboard 2 PROJECT=thingsboard
3 APP=cassandra 3 APP=cassandra
4 4
5 -all: build  
6 -  
7 build: 5 build:
8 docker build --pull -t ${PROJECT}/${APP}:${VERSION} . 6 docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
9 7
10 push: build 8 push: build
11 - docker push ${PROJECT}/${APP}:${VERSION}  
12 -  
13 -.PHONY: all build push  
  9 + docker push ${PROJECT}/${APP}:${VERSION}
@@ -2,12 +2,12 @@ VERSION=k8stest @@ -2,12 +2,12 @@ VERSION=k8stest
2 PROJECT=thingsboard 2 PROJECT=thingsboard
3 APP=thingsboard-db-schema 3 APP=thingsboard-db-schema
4 4
5 -all: build  
6 -  
7 build: 5 build:
  6 + cp ../../dao/src/main/resources/schema.cql .
  7 + cp ../../dao/src/main/resources/demo-data.cql .
  8 + cp ../../dao/src/main/resources/system-data.cql .
8 docker build --pull -t ${PROJECT}/${APP}:${VERSION} . 9 docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
9 10
10 push: build 11 push: build
11 docker push ${PROJECT}/${APP}:${VERSION} 12 docker push ${PROJECT}/${APP}:${VERSION}
12 -  
13 -.PHONY: all build push  
  13 + rm schema.cql demo-data.cql system-data.cql
@@ -2,12 +2,10 @@ VERSION=k8stest @@ -2,12 +2,10 @@ VERSION=k8stest
2 PROJECT=thingsboard 2 PROJECT=thingsboard
3 APP=application 3 APP=application
4 4
5 -all: build  
6 -  
7 build: 5 build:
  6 + cp ../../application/target/thingsboard.deb .
8 docker build --pull -t ${PROJECT}/${APP}:${VERSION} . 7 docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
9 8
10 push: build 9 push: build
11 docker push ${PROJECT}/${APP}:${VERSION} 10 docker push ${PROJECT}/${APP}:${VERSION}
12 -  
13 -.PHONY: all build push  
  11 + rm thingsboard.deb
@@ -2,12 +2,8 @@ VERSION=k8stest @@ -2,12 +2,8 @@ VERSION=k8stest
2 PROJECT=thingsboard 2 PROJECT=thingsboard
3 APP=zk 3 APP=zk
4 4
5 -all: build  
6 -  
7 build: 5 build:
8 docker build --pull -t ${PROJECT}/${APP}:${VERSION} . 6 docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
9 7
10 push: build 8 push: build
11 docker push ${PROJECT}/${APP}:${VERSION} 9 docker push ${PROJECT}/${APP}:${VERSION}
12 -  
13 -.PHONY: all build push