Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs

docker/cassandra/Dockerfile

@@ -0,0 +1,23 @@
+#
+# Copyright © 2016-2017 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM cassandra:3.9
+
+ADD ready-probe.sh /ready-probe.sh
+
+RUN chmod +x /ready-probe.sh
+
+CMD ["cassandra", "-f"]

docker/cassandra/Makefile

@@ -0,0 +1,10 @@
+VERSION=1.2.4
+PROJECT=thingsboard
+APP=cassandra
+
+build:
+	docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
+
+push: build
+	docker push ${PROJECT}/${APP}:${VERSION}
+    docker push ${PROJECT}/${APP}:latest

docker/cassandra/cassandra.yaml

@@ -54,7 +54,7 @@ spec:
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: cassandra
-        image: cassandra:3.9
+        image: thingsboard/cassandra:1.2.4
         imagePullPolicy: Always
         ports:
         - containerPort: 7000

docker/cassandra/ready-probe.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#
+# Copyright © 2016-2017 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if [[ $(nodetool status | grep $POD_IP) == *"UN"* ]]; then
+  if [[ $DEBUG ]]; then
+    echo "UN";
+  fi
+  exit 0;
+else
+  if [[ $DEBUG ]]; then
+    echo "Not Up";
+  fi
+  exit 1;
+fi

docker/tb-cassandra-schema/Makefile

@@ -6,8 +6,9 @@ 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} .
+	docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
 	rm schema.cql demo-data.cql system-data.cql
 
 push: build
-	docker push ${PROJECT}/${APP}:${VERSION}
+	docker push ${PROJECT}/${APP}:${VERSION}
+    docker push ${PROJECT}/${APP}:latest

docker/tb-cassandra-schema/tb-cassandra-schema.yaml

@@ -25,11 +25,11 @@ spec:
     image: thingsboard/tb-cassandra-schema:1.2.4
     env:
     - name: CREATE_SCHEMA
-      value: "false"
+      value: "true"
     - name: ADD_SYSTEM_DATA
-      value: "false"
+      value: "true"
     - name : ADD_DEMO_DATA
-      value: "false"
+      value: "true"
     - name : CASSANDRA_URL
       value: "cassandra-headless"
     command:

docker/tb/Makefile

@@ -4,8 +4,9 @@ APP=application
 
 build:
 	cp ../../application/target/thingsboard.deb .
-	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
+	docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
 	rm thingsboard.deb
 
 push: build
-	docker push ${PROJECT}/${APP}:${VERSION}
+	docker push ${PROJECT}/${APP}:${VERSION}
+    docker push ${PROJECT}/${APP}:latest

docker/zookeeper/Makefile

@@ -3,7 +3,8 @@ PROJECT=thingsboard
 APP=zk
 
 build:
-	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
+	docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
 
 push: build
 	docker push ${PROJECT}/${APP}:${VERSION}
+	docker push ${PROJECT}/${APP}:latest