From 8ed9cf8620351b3e80e30a72a83b0f8ced1f1366 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 24 May 2017 16:37:20 +0300
Subject: [PATCH] Removed cassandra custom image

---
 docker/cassandra/Dockerfile      | 21 ---------------------
 docker/cassandra/Makefile        |  9 ---------
 docker/cassandra/cassandra.yaml  |  2 +-
 docker/cassandra/ready-probe.sh  | 28 ----------------------------
 docker/docker-compose.random.yml | 26 --------------------------
 docker/docker-compose.yml        |  9 +++++++--
 6 files changed, 8 insertions(+), 87 deletions(-)
 delete mode 100644 docker/cassandra/Dockerfile
 delete mode 100644 docker/cassandra/Makefile
 delete mode 100755 docker/cassandra/ready-probe.sh
 delete mode 100644 docker/docker-compose.random.yml

diff --git a/docker/cassandra/Dockerfile b/docker/cassandra/Dockerfile
deleted file mode 100644
index ec8117358f..0000000000
--- a/docker/cassandra/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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
-
-COPY ready-probe.sh /
-
-CMD ["cassandra", "-f"]
\ No newline at end of file
diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile
deleted file mode 100644
index cb577cb502..0000000000
--- a/docker/cassandra/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-VERSION=k8stest
-PROJECT=thingsboard
-APP=cassandra
-
-build:
-	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
-
-push: build
-	docker push ${PROJECT}/${APP}:${VERSION}
\ No newline at end of file
diff --git a/docker/cassandra/cassandra.yaml b/docker/cassandra/cassandra.yaml
index 24312ae562..e54d47b07a 100644
--- a/docker/cassandra/cassandra.yaml
+++ b/docker/cassandra/cassandra.yaml
@@ -54,7 +54,7 @@ spec:
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: cassandra
-        image: thingsboard/cassandra:k8stest
+        image: cassandra:3.9
         imagePullPolicy: Always
         ports:
         - containerPort: 7000
diff --git a/docker/cassandra/ready-probe.sh b/docker/cassandra/ready-probe.sh
deleted file mode 100755
index 68faf927fe..0000000000
--- a/docker/cassandra/ready-probe.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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.
-#
-
-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
\ No newline at end of file
diff --git a/docker/docker-compose.random.yml b/docker/docker-compose.random.yml
deleted file mode 100644
index f066c5cad5..0000000000
--- a/docker/docker-compose.random.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# 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.
-#
-
-version: '2'
-
-services:
-  cassandra:
-    ports:
-      - "9042"
-      - "9160"
-  zk:
-    ports:
-      - "2181"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 498080447d..c86f20d98c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -35,9 +35,14 @@ services:
       - CASSANDRA_URL=${CASSANDRA_URL}
     entrypoint: ./install-schema.sh
   cassandra:
-    image: "thingsboard/cassandra:k8stest"
+    image: "cassandra:3.9"
+    ports:
+      - "9042"
+      - "9160"
     volumes:
       - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra"
   zk:
-    image: "thingsboard/zk:k8stest"
+    image: "zookeeper:3.4.9"
+    ports:
+      - "2181"
     restart: always