From 0c2342239da70c9fe8a9052077ef5433a3e40718 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 27 Jun 2017 16:51:15 +0300
Subject: [PATCH] Changed default folder for docker containers

---
 docker/docker-compose.yml                           |  4 ++--
 docker/tb-cassandra-schema/Dockerfile               | 11 +++++------
 docker/tb-cassandra-schema/Makefile                 |  2 +-
 docker/tb-cassandra-schema/install-schema.sh        |  6 +++---
 docker/tb-cassandra-schema/tb-cassandra-schema.yaml |  2 +-
 docker/tb/Dockerfile                                |  8 +++-----
 docker/tb/run-application.sh                        |  2 +-
 docker/tb/tb.yaml                                   |  2 +-
 8 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fa11fec6bf..988a2db6d0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       - "5683:5683/udp"
     env_file:
       - tb.env
-    entrypoint: ./run-application.sh
+    entrypoint: /run-application.sh
   tb-cassandra-schema:
     image: "thingsboard/tb-cassandra-schema:1.2.4"
     environment:
@@ -33,7 +33,7 @@ services:
       - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA}
       - ADD_DEMO_DATA=${ADD_DEMO_DATA}
       - CASSANDRA_URL=${CASSANDRA_URL}
-    entrypoint: ./install-schema.sh
+    entrypoint: /install-schema.sh
   cassandra:
     image: "cassandra:3.9"
     ports:
diff --git a/docker/tb-cassandra-schema/Dockerfile b/docker/tb-cassandra-schema/Dockerfile
index d1675714c1..e78042da75 100644
--- a/docker/tb-cassandra-schema/Dockerfile
+++ b/docker/tb-cassandra-schema/Dockerfile
@@ -16,14 +16,13 @@
 
 FROM cassandra:3.9
 
-ADD install-schema.sh /root/install-schema.sh
+ADD install-schema.sh /install-schema.sh
 
 RUN apt-get update \
         && apt-get install -y nmap \
-        && chmod +x /root/install-schema.sh
+        && chmod +x /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
+ADD schema.cql /schema.cql
+ADD demo-data.cql /demo-data.cql
+ADD system-data.cql /system-data.cql
 
-WORKDIR /root
diff --git a/docker/tb-cassandra-schema/Makefile b/docker/tb-cassandra-schema/Makefile
index 23d460ad39..72af77b756 100644
--- a/docker/tb-cassandra-schema/Makefile
+++ b/docker/tb-cassandra-schema/Makefile
@@ -11,4 +11,4 @@ build:
 
 push: build
 	docker push ${PROJECT}/${APP}:${VERSION}
-    docker push ${PROJECT}/${APP}:latest
+	docker push ${PROJECT}/${APP}:latest
diff --git a/docker/tb-cassandra-schema/install-schema.sh b/docker/tb-cassandra-schema/install-schema.sh
index 128bd16e5e..0845a73a47 100644
--- a/docker/tb-cassandra-schema/install-schema.sh
+++ b/docker/tb-cassandra-schema/install-schema.sh
@@ -24,7 +24,7 @@ done
 
 if [ "$CREATE_SCHEMA" == "true" ]; then
     echo "Creating 'Thingsboard' keyspace..."
-    cqlsh $CASSANDRA_URL -f /root/schema.cql
+    cqlsh $CASSANDRA_URL -f /schema.cql
     if [ "$?" -eq 0 ]; then
         echo "'Thingsboard' keyspace was successfully created!"
     else
@@ -34,7 +34,7 @@ fi
 
 if [ "$ADD_SYSTEM_DATA" == "true" ]; then
     echo "Adding system data..."
-    cqlsh $CASSANDRA_URL -f /root/system-data.cql
+    cqlsh $CASSANDRA_URL -f /system-data.cql
     if [ "$?" -eq 0 ]; then
         echo "System data was successfully added!"
     else
@@ -44,7 +44,7 @@ fi
 
 if [ "$ADD_DEMO_DATA" == "true" ]; then
     echo "Adding demo data..."
-    cqlsh $CASSANDRA_URL -f /root/demo-data.cql
+    cqlsh $CASSANDRA_URL -f /demo-data.cql
     if [ "$?" -eq 0 ]; then
         echo "Demo data was successfully added!"
     else
diff --git a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
index 7b46a2e9f2..b86cb90dde 100644
--- a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
+++ b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
@@ -35,5 +35,5 @@ spec:
     command:
     - sh
     - -c
-    - ./install-schema.sh
+    - /install-schema.sh
   restartPolicy: Never
\ No newline at end of file
diff --git a/docker/tb/Dockerfile b/docker/tb/Dockerfile
index c2e2d7b631..b2a3da6e06 100644
--- a/docker/tb/Dockerfile
+++ b/docker/tb/Dockerfile
@@ -16,9 +16,7 @@
 
 FROM openjdk:8-jre
 
-ADD run-application.sh /root/run-application.sh
-ADD thingsboard.deb /root/thingsboard.deb
+ADD run-application.sh /run-application.sh
+ADD thingsboard.deb /thingsboard.deb
 
-RUN chmod +x /root/run-application.sh
-
-WORKDIR /root
+RUN chmod +x /run-application.sh
diff --git a/docker/tb/run-application.sh b/docker/tb/run-application.sh
index c5df758eda..4824133a28 100755
--- a/docker/tb/run-application.sh
+++ b/docker/tb/run-application.sh
@@ -16,7 +16,7 @@
 #
 
 
-dpkg -i /root/thingsboard.deb
+dpkg -i /thingsboard.deb
 
 reachable=0
 while [ $reachable -eq 0 ];
diff --git a/docker/tb/tb.yaml b/docker/tb/tb.yaml
index 15ed1939d5..45f987f04f 100644
--- a/docker/tb/tb.yaml
+++ b/docker/tb/tb.yaml
@@ -112,7 +112,7 @@ spec:
         command:
         - sh
         - -c
-        - ./run-application.sh
+        - /run-application.sh
         livenessProbe:
           httpGet:
             path: /login