From ad7c8750c47e5603a685553df5df36efc367ded5 Mon Sep 17 00:00:00 2001
From: volodymyr-babak <volodymyr.babak@gmail.com>
Date: Mon, 5 Dec 2016 21:01:22 +0200
Subject: [PATCH 1/2] Added db-schema container push

---
 docker/docker-compose.yml                        |  6 +-----
 docker/thingsboard-db-schema/Dockerfile          |  4 ++++
 docker/thingsboard-db-schema/build_and_deploy.sh | 11 +++++++++++
 docker/thingsboard/run_thingsboard.sh            |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100755 docker/thingsboard-db-schema/build_and_deploy.sh

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fd1c0a1991..9c86e78217 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -31,15 +31,11 @@ services:
       - thingsboard.env
     entrypoint: ./run_thingsboard.sh
   thingsboard-db-schema:
-    build: thingsboard-db-schema
+    image: "thingsboard/thingsboard-db-schema:0.1"
     links:
       - cassandra:db
     env_file:
       - thingsboard-db-schema.env
-    volumes:
-      - "../dao/src/main/resources/schema.cql:/root/schema.cql"
-      - "../dao/src/main/resources/demo-data.cql:/root/demo-data.cql"
-      - "../dao/src/main/resources/system-data.cql:/root/system-data.cql"
     entrypoint: ./install_schema.sh
   cassandra:
     image: "cassandra:3.9"
diff --git a/docker/thingsboard-db-schema/Dockerfile b/docker/thingsboard-db-schema/Dockerfile
index 12e7dc74ef..569698058f 100644
--- a/docker/thingsboard-db-schema/Dockerfile
+++ b/docker/thingsboard-db-schema/Dockerfile
@@ -23,4 +23,8 @@ RUN apt-get update \
 
 RUN chmod +x /root/install_schema.sh
 
+ADD schema.cql /root/schema.cql
+ADD demo-data.cql /root/demo-data.cql
+ADD system-data.cql /root/system-data.cql
+
 WORKDIR /root
diff --git a/docker/thingsboard-db-schema/build_and_deploy.sh b/docker/thingsboard-db-schema/build_and_deploy.sh
new file mode 100755
index 0000000000..fb6f617ff4
--- /dev/null
+++ b/docker/thingsboard-db-schema/build_and_deploy.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cp ../../dao/src/main/resources/schema.cql schema.cql
+cp ../../dao/src/main/resources/demo-data.cql demo-data.cql
+cp ../../dao/src/main/resources/system-data.cql system-data.cql
+
+docker build -t thingsboard/thingsboard-db-schema:0.1 .
+
+docker login
+
+docker push thingsboard/thingsboard-db-schema:0.1
\ No newline at end of file
diff --git a/docker/thingsboard/run_thingsboard.sh b/docker/thingsboard/run_thingsboard.sh
index 62079731ad..c41e53eb08 100755
--- a/docker/thingsboard/run_thingsboard.sh
+++ b/docker/thingsboard/run_thingsboard.sh
@@ -40,5 +40,5 @@ echo "Starting 'Thingsboard' service..."
 service thingsboard start
 
 # Wait until log file is created
-sleep 3
+sleep 10
 tail -f /var/log/thingsboard/thingsboard.log

From 4b1e0df43584acde509fb4d735f54e40a709a828 Mon Sep 17 00:00:00 2001
From: volodymyr-babak <volodymyr.babak@gmail.com>
Date: Mon, 5 Dec 2016 21:07:35 +0200
Subject: [PATCH 2/2] 0.1 -> 1.0

---
 docker/docker-compose.yml                        | 4 ++--
 docker/thingsboard-db-schema/build_and_deploy.sh | 4 ++--
 docker/thingsboard/build_and_deploy.sh           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9c86e78217..b15b7fa590 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,7 +18,7 @@ version: '2'
 
 services:
   thingsboard:
-    image: "thingsboard/application:0.1"
+    image: "thingsboard/application:1.0"
     ports:
       - "8080:8080"
       - "1883:1883"
@@ -31,7 +31,7 @@ services:
       - thingsboard.env
     entrypoint: ./run_thingsboard.sh
   thingsboard-db-schema:
-    image: "thingsboard/thingsboard-db-schema:0.1"
+    image: "thingsboard/thingsboard-db-schema:1.0"
     links:
       - cassandra:db
     env_file:
diff --git a/docker/thingsboard-db-schema/build_and_deploy.sh b/docker/thingsboard-db-schema/build_and_deploy.sh
index fb6f617ff4..5dd115ce6b 100755
--- a/docker/thingsboard-db-schema/build_and_deploy.sh
+++ b/docker/thingsboard-db-schema/build_and_deploy.sh
@@ -4,8 +4,8 @@ cp ../../dao/src/main/resources/schema.cql schema.cql
 cp ../../dao/src/main/resources/demo-data.cql demo-data.cql
 cp ../../dao/src/main/resources/system-data.cql system-data.cql
 
-docker build -t thingsboard/thingsboard-db-schema:0.1 .
+docker build -t thingsboard/thingsboard-db-schema:1.0 .
 
 docker login
 
-docker push thingsboard/thingsboard-db-schema:0.1
\ No newline at end of file
+docker push thingsboard/thingsboard-db-schema:1.0
\ No newline at end of file
diff --git a/docker/thingsboard/build_and_deploy.sh b/docker/thingsboard/build_and_deploy.sh
index 937ac4bc1f..acbb4202d7 100755
--- a/docker/thingsboard/build_and_deploy.sh
+++ b/docker/thingsboard/build_and_deploy.sh
@@ -18,8 +18,8 @@
 
 cp ../../application/target/thingsboard.deb thingsboard.deb
 
-docker build -t thingsboard/application:0.1 .
+docker build -t thingsboard/application:1.0 .
 
 docker login
 
-docker push thingsboard/application:0.1
\ No newline at end of file
+docker push thingsboard/application:1.0
\ No newline at end of file