Merge branch 'master' of github.com:volodymyr-babak/thingsboard

@@ -115,7 +115,9 @@ cassandra:
   # Thingsboard keyspace name
   keyspace_name: "${CASSANDRA_KEYSPACE_NAME:thingsboard}"
   # Specify node list
-  url: "${CASSANDRA_URL:127.0.0.1:9042}"
+  host: "${CASSANDRA_HOST:127.0.0.1}"
+  # Specify node list
+  post: "${CASSANDRA_PORT:9042}"
   # Enable/disable secure connection
   ssl: "${CASSANDRA_USE_SSL:false}"
   # Enable/disable JMX
@@ -233,7 +235,7 @@ spring:
   jpa:
     hibernate:
       ddl-auto: "validate"
-    database-platform: "org.hibernate.dialect.HSQLDialect"
+    database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.HSQLDialect}"
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.hsqldb.jdbc.JDBCDriver}"
     url: "${SPRING_DATASOURCE_URL:jdbc:hsqldb:file:${SQL_DATA_FOLDER:/tmp}/thingsboardDb;sql.enforce_size=false}"
@@ -250,7 +252,7 @@ spring:
 #  jpa:
 #    hibernate:
 #      ddl-auto: "validate"
-#    database-platform: "org.hibernate.dialect.PostgreSQLDialect"
+#    database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
 #  datasource:
 #    driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
 #    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}"

@@ -44,7 +44,7 @@ public abstract class AbstractCassandraCluster {
 
     @Value("${cassandra.cluster_name}")
     private String clusterName;
-    @Value("${cassandra.url}")
+    @Value("${cassandra.host}:${cassandra.port}")
     private String url;
     @Value("${cassandra.compression}")
     private String compression;

@@ -2,7 +2,9 @@ cassandra.cluster_name=Thingsboard Cluster
 
 cassandra.keyspace_name=thingsboard
 
-cassandra.url=127.0.0.1:9142
+cassandra.host=127.0.0.1
+
+cassandra.port=9142
 
 cassandra.ssl=false
 

 # cassandra environment variables
 CASSANDRA_DATA_DIR=/home/docker/cassandra_volume
-CASSANDRA_URL=cassandra
 
 # postgres environment variables
 POSTGRES_DATA_DIR=/home/docker/postgres_volume
 POSTGRES_DB=thingsboard
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=postgres
-POSTGRES_URL=postgres
+
+# hsqldb environment variables
+HSQLDB_DATA_DIR=/home/docker/hsqldb_volume
 
 # environment variables for schema init and insert system and demo data
-CREATE_SCHEMA=true
-ADD_SYSTEM_DATA=false
+ADD_SCHEMA_AND_SYSTEM_DATA=false
 ADD_DEMO_DATA=false
\ No newline at end of file

@@ -14,15 +14,11 @@
 # limitations under the License.
 #
 
-FROM cassandra:3.9
+FROM openjdk:8-jre
 
-ADD install-schema.sh /install-schema.sh
+ADD install.sh /install.sh
+ADD thingsboard.deb /thingsboard.deb
 
 RUN apt-get update \
         && apt-get install -y nmap \
-        && chmod +x /install-schema.sh
-
-ADD schema.cql /schema.cql
-ADD demo-data.cql /demo-data.cql
-ADD system-data.cql /system-data.cql
-
+        && chmod +x /install.sh

 VERSION=1.2.4
 PROJECT=thingsboard
-APP=tb-cassandra-schema
+APP=cassandra-setup
 
 build:
-	cp ../../dao/src/main/resources/cassandra/schema.cql .
-	cp ../../dao/src/main/resources/cassandra/demo-data.cql .
-	cp ../../dao/src/main/resources/cassandra/system-data.cql .
+	cp ../../application/target/thingsboard.deb .
 	docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
-	rm schema.cql demo-data.cql system-data.cql
+	rm thingsboard.deb
 
 push: build
 	docker push ${PROJECT}/${APP}:${VERSION}

+#!/bin/bash
 #
 # Copyright © 2016-2017 The Thingsboard Authors
 #
@@ -14,14 +15,19 @@
 # limitations under the License.
 #
 
-FROM postgres:9.6
 
-ADD install-schema.sh /install-schema.sh
+dpkg -i /thingsboard.deb
 
-RUN apt-get update \
-        && apt-get install -y nmap \
-        && chmod +x /install-schema.sh
+until nmap $CASSANDRA_HOST -p $CASSANDRA_PORT | grep "$CASSANDRA_PORT/tcp open"
+do
+  echo "Wait for cassandra db to start..."
+  sleep 10
+done
 
-ADD schema.sql /schema.sql
-ADD system-data.sql /system-data.sql
-ADD demo-data.sql /demo-data.sql
\ No newline at end of file
+echo "Creating 'Thingsboard' schema and system data..."
+if [ "$ADD_DEMO_DATA" == "true" ]; then
+    echo "plus demo data..."
+    /usr/share/thingsboard/bin/install/install.sh --loadDemo
+elif [ "$ADD_DEMO_DATA" == "false" ]; then
+    /usr/share/thingsboard/bin/install/install.sh
+fi

@@ -7,4 +7,4 @@ build:
 
 push: build
 	docker push ${PROJECT}/${APP}:${VERSION}
-    docker push ${PROJECT}/${APP}:latest
+	docker push ${PROJECT}/${APP}:latest

@@ -25,15 +25,12 @@ services:
       - "5683:5683/udp"
     env_file:
       - tb.env
-    entrypoint: /run-application.sh
-  tb-cassandra-schema:
-    image: "thingsboard/tb-cassandra-schema:1.2.4"
     environment:
-      - CREATE_SCHEMA=${CREATE_SCHEMA}
-      - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA}
+      - ADD_SCHEMA_AND_SYSTEM_DATA=${ADD_SCHEMA_AND_SYSTEM_DATA}
       - ADD_DEMO_DATA=${ADD_DEMO_DATA}
-      - CASSANDRA_URL=${CASSANDRA_URL}
-    entrypoint: /install-schema.sh
+    volumes:
+      - "${HSQLDB_DATA_DIR}:/usr/share/thingsboard/data/sql"
+    entrypoint: /run-application.sh
   cassandra:
     image: "cassandra:3.9"
     ports:
@@ -52,18 +49,5 @@ services:
     - "5432"
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     volumes:
       - "${POSTGRES_DATA_DIR}:/var/lib/postgresql/data"
-  tb-postgres-schema:
-    image: "thingsboard/tb-postgres-schema:1.2.4"
-    environment:
-      - POSTGRES_URL=${POSTGRES_URL}
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - CREATE_SCHEMA=${CREATE_SCHEMA}
-      - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA}
-      - ADD_DEMO_DATA=${ADD_DEMO_DATA}
-    entrypoint: /install-schema.sh
\ No newline at end of file

@@ -17,23 +17,23 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: tb-cassandra-schema
+  name: cassandra-setup
 spec:
   containers:
-  - name: tb-cassandra-schema
+  - name: cassandra-setup
     imagePullPolicy: Always
-    image: thingsboard/tb-cassandra-schema:1.2.4
+    image: thingsboard/cassandra-setup:1.2.4
     env:
-    - name: CREATE_SCHEMA
+    - name: ADD_DEMO_DATA
       value: "true"
-    - name: ADD_SYSTEM_DATA
-      value: "true"
-    - name : ADD_DEMO_DATA
-      value: "true"
-    - name : CASSANDRA_URL
+    - name : CASSANDRA_HOST
       value: "cassandra-headless"
+    - name : CASSANDRA_PORT
+      value: "9042"
+    - name : DATABASE_TYPE
+      value: "cassandra"
     command:
     - sh
     - -c
-    - /install-schema.sh
-  restartPolicy: Never
\ No newline at end of file
+    - /install.sh
+  restartPolicy: Never

@@ -50,7 +50,9 @@ metadata:
 data:
   zookeeper.enabled: "true"
   zookeeper.url: "zk-headless"
-  cassandra.url: "cassandra-headless:9042"
+  cassandra.host: "cassandra-headless"
+  cassandra.port: "9042"
+  database.type: "cassandra"
 ---
 apiVersion: apps/v1beta1
 kind: StatefulSet
@@ -100,11 +102,21 @@ spec:
             configMapKeyRef:
               name: tb-config
               key: zookeeper.url
-        - name : CASSANDRA_URL
+        - name : CASSANDRA_HOST
           valueFrom:
             configMapKeyRef:
               name: tb-config
-              key: cassandra.url
+              key: cassandra.host
+        - name : CASSANDRA_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: tb-config
+              key: cassandra.port
+        - name: DATABASE_TYPE
+          valueFrom:
+            configMapKeyRef:
+              name: tb-config
+              key: database.type
         - name : RPC_HOST
           valueFrom:
             fieldRef:

-#!/bin/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.
-#
-
-
-until nmap $CASSANDRA_URL -p 9042 | grep "9042/tcp open"
-do
-  echo "Wait for $CASSANDRA_URL..."
-  sleep 10
-done
-
-if [ "$CREATE_SCHEMA" == "true" ]; then
-    echo "Creating 'Thingsboard' keyspace..."
-    cqlsh $CASSANDRA_URL -f /schema.cql
-    if [ "$?" -eq 0 ]; then
-        echo "'Thingsboard' keyspace was successfully created!"
-    else
-        echo "There were issues while creating 'Thingsboard' keyspace!"
-    fi
-fi
-
-if [ "$ADD_SYSTEM_DATA" == "true" ]; then
-    echo "Adding system data..."
-    cqlsh $CASSANDRA_URL -f /system-data.cql
-    if [ "$?" -eq 0 ]; then
-        echo "System data was successfully added!"
-    else
-        echo "There were issues while adding System data!"
-    fi
-fi
-
-if [ "$ADD_DEMO_DATA" == "true" ]; then
-    echo "Adding demo data..."
-    cqlsh $CASSANDRA_URL -f /demo-data.cql
-    if [ "$?" -eq 0 ]; then
-        echo "Demo data was successfully added!"
-    else
-        echo "There were issues while adding Demo data!"
-    fi
-fi

-VERSION=1.2.4
-PROJECT=thingsboard
-APP=tb-postgres-schema
-
-build:
-	cp ../../dao/src/main/resources/postgres/schema.sql .
-	cp ../../dao/src/main/resources/postgres/demo-data.sql .
-	cp ../../dao/src/main/resources/postgres/system-data.sql .
-	docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
-	rm schema.sql demo-data.sql system-data.sql
-
-push: build
-	docker push ${PROJECT}/${APP}:${VERSION}
-	docker push ${PROJECT}/${APP}:latest

-#!/bin/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.
-#
-
-until nmap $POSTGRES_URL -p 5432 | grep "5432/tcp open"
-do
-  echo "Waiting for $POSTGRES_URL..."
-  sleep 10
-done
-
-if [ "$CREATE_SCHEMA" == "true" ]; then
-    echo "Creating 'Thingsboard' database schema..."
-    PGPASSWORD="$POSTGRES_PASSWORD" psql -h "$POSTGRES_URL" -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" -f /schema.sql
-    if [ "$?" -eq 0 ]; then
-        echo "'Thingsboard' database schema was successfully created!"
-    else
-        echo "There were issues while creating 'Thingsboard' database schema!"
-    fi
-fi
-
-if [ "$ADD_SYSTEM_DATA" == "true" ]; then
-    echo "Adding system data..."
-    PGPASSWORD="$POSTGRES_PASSWORD" psql -h "$POSTGRES_URL" -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" -f /system-data.sql
-    if [ "$?" -eq 0 ]; then
-        echo "System data was successfully added!"
-    else
-        echo "There were issues while adding System data!"
-    fi
-fi
-
-if [ "$ADD_DEMO_DATA" == "true" ]; then
-    echo "Adding demo data..."
-    PGPASSWORD="$POSTGRES_PASSWORD" psql -h "$POSTGRES_URL" -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" -f /demo-data.sql
-    if [ "$?" -eq 0 ]; then
-        echo "Demo data was successfully added!"
-    else
-        echo "There were issues while adding Demo data!"
-    fi
-fi

 #Thingsboard server configuration
-
-TB_CASSANDRA_SCHEMA_URL=tb-cassandra-schema
-CASSANDRA_URL=cassandra:9042
-ZOOKEEPER_URL=zk:2181
 MQTT_BIND_ADDRESS=0.0.0.0
 MQTT_BIND_PORT=1883
 COAP_BIND_ADDRESS=0.0.0.0
-COAP_BIND_PORT=5683
\ No newline at end of file
+COAP_BIND_PORT=5683
+
+# zk config
+ZOOKEEPER_URL=zk:2181
+
+# type of database to use: sql[DEFAULT] or cassandra
+DATABASE_TYPE=cassandra
+
+# cassandra db config
+CASSANDRA_HOST=cassandra
+CASSANDRA_PORT=9042
+
+# postgres db config
+# SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQLDialect
+# SPRING_DRIVER_CLASS_NAME=org.postgresql.Driver
+# SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/thingsboard
+# SPRING_DATASOURCE_USERNAME=postgres
+# SPRING_DATASOURCE_PASSWORD=postgres

@@ -19,4 +19,6 @@ FROM openjdk:8-jre
 ADD run-application.sh /run-application.sh
 ADD thingsboard.deb /thingsboard.deb
 
-RUN chmod +x /run-application.sh
+RUN apt-get update \
+        && apt-get install -y nmap \
+        && chmod +x /run-application.sh

@@ -9,4 +9,4 @@ build:
 
 push: build
 	docker push ${PROJECT}/${APP}:${VERSION}
-    docker push ${PROJECT}/${APP}:latest
+	docker push ${PROJECT}/${APP}:latest

@@ -18,18 +18,34 @@
 
 dpkg -i /thingsboard.deb
 
-reachable=0
-while [ $reachable -eq 0 ];
-do
-  echo "$TB_CASSANDRA_SCHEMA_URL container is still in progress. waiting until it completed..."
-  sleep 3
-  ping -q -c 1 $TB_CASSANDRA_SCHEMA_URL > /dev/null 2>&1
-  if [ "$?" -ne 0 ];
-  then
-    echo "$TB_CASSANDRA_SCHEMA_URL container completed!"
-    reachable=1
-  fi
-done
+if [ "$DATABASE_TYPE" == "cassandra" ]; then
+    until nmap $CASSANDRA_HOST -p $CASSANDRA_PORT | grep "$CASSANDRA_PORT/tcp open"
+    do
+      echo "Wait for cassandra db to start..."
+      sleep 10
+    done
+fi
+
+if [ "$DATABASE_TYPE" == "sql" ]; then
+    if [ "$SPRING_DRIVER_CLASS_NAME" == "org.postgresql.Driver" ]; then
+        until nmap postgres -p 5432 | grep "5432/tcp open"
+        do
+          echo "Waiting for postgres db to start..."
+          sleep 10
+        done
+    fi
+fi
+
+if [ "$ADD_SCHEMA_AND_SYSTEM_DATA" == "true" ]; then
+    echo "Creating 'Thingsboard' schema and system data..."
+    if [ "$ADD_DEMO_DATA" == "true" ]; then
+        echo "plus demo data..."
+        /usr/share/thingsboard/bin/install/install.sh --loadDemo
+    elif [ "$ADD_DEMO_DATA" == "false" ]; then
+        /usr/share/thingsboard/bin/install/install.sh
+    fi
+fi
+
 
 # Copying env variables into conf files
 printenv | awk -F "=" '{print "export " $1 "='\''" $2 "'\''"}' >> /usr/share/thingsboard/conf/thingsboard.conf