From 3dacb296fc00c012a06ad75a2c64ceac04d170d3 Mon Sep 17 00:00:00 2001
From: viktor <vzikratyi@thingsboard.io>
Date: Tue, 12 May 2020 16:18:30 +0300
Subject: [PATCH] start tb-cassandra with 'cassandra' user

---
 msa/tb/docker-cassandra/Dockerfile  | 15 +++++++++++++++
 msa/tb/docker-cassandra/start-db.sh |  4 ----
 msa/tb/docker-cassandra/stop-db.sh  | 12 +++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/msa/tb/docker-cassandra/Dockerfile b/msa/tb/docker-cassandra/Dockerfile
index 3a761398fd..7a2b86b831 100644
--- a/msa/tb/docker-cassandra/Dockerfile
+++ b/msa/tb/docker-cassandra/Dockerfile
@@ -49,6 +49,21 @@ ENV DATABASE_ENTITIES_TYPE=cassandra
 
 ENV CASSANDRA_HOST=localhost
 ENV CASSANDRA_PORT=9042
+ENV CASSANDRA_HOME=/opt/cassandra
+ENV PATH $CASSANDRA_HOME/bin:$PATH
+
+RUN rm -rf /var/lib/cassandra
+
+RUN chmod a+w /var/lib
+
+RUN mkdir -p $DATA_FOLDER
+RUN chown -R cassandra:cassandra /data
+
+RUN chown -R cassandra:cassandra /var/log/${pkg.name}
+RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
+
+
+USER cassandra
 
 EXPOSE 9090
 EXPOSE 1883
diff --git a/msa/tb/docker-cassandra/start-db.sh b/msa/tb/docker-cassandra/start-db.sh
index d65edf71b1..5197fb02d3 100644
--- a/msa/tb/docker-cassandra/start-db.sh
+++ b/msa/tb/docker-cassandra/start-db.sh
@@ -19,12 +19,8 @@ cassandra_data_dir=${DATA_FOLDER}/db
 cassandra_data_link=/var/lib/cassandra
 
 if [ ! -L ${cassandra_data_link} ]; then
-    if [ -d ${cassandra_data_link} ]; then
-        rm -rf ${cassandra_data_link}
-    fi
     if [ ! -d ${cassandra_data_dir} ]; then
         mkdir -p ${cassandra_data_dir}
-        chown -R cassandra:cassandra ${cassandra_data_dir}
     fi
     ln -s ${cassandra_data_dir} ${cassandra_data_link}
 fi
diff --git a/msa/tb/docker-cassandra/stop-db.sh b/msa/tb/docker-cassandra/stop-db.sh
index 24cf570999..bca71375fc 100644
--- a/msa/tb/docker-cassandra/stop-db.sh
+++ b/msa/tb/docker-cassandra/stop-db.sh
@@ -15,4 +15,14 @@
 # limitations under the License.
 #
 
-service cassandra stop
+CASSANDRA_PID=$(ps aux | grep '[c]assandra' | awk '{print $2}')
+
+echo "Stopping cassandra (pid ${CASSANDRA_PID})."
+kill -SIGTERM ${CASSANDRA_PID}
+
+while [ -e /proc/${CASSANDRA_PID} ]
+do
+    echo "Waiting for cassandra to stop."
+    sleep 2
+done
+echo "Cassandra was stopped."
\ No newline at end of file