thingsboard-memoizeit

Removed cassandra custom image

5/24/2017 10:37:20 AM

Volodymyr Babak

Commit: 8ed9cf8

Tree: 736bda7

Parents: 868f5d3

Changes

docker/cassandra/cassandra.yaml 2(+1 -1)

docker/cassandra/Dockerfile 21(+0 -21)

docker/cassandra/Makefile 9(+0 -9)

docker/cassandra/ready-probe.sh 28(+0 -28)

docker/docker-compose.random.yml 26(+0 -26)

docker/docker-compose.yml 9(+7 -2)

Details

docker/cassandra/cassandra.yaml 2(+1 -1)

diff --git a/docker/cassandra/cassandra.yaml b/docker/cassandra/cassandra.yaml
index 24312ae..e54d47b 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

docker/docker-compose.yml 9(+7 -2)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4980804..c86f20d 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