From 68122de344e5d7b23a8af556a34260747196ca1d Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Mon, 5 Mar 2018 17:43:49 +0200
Subject: [PATCH] Update docker version to 1.4.0

---
 docker/cassandra-setup/Makefile | 2 +-
 docker/cassandra/Dockerfile     | 2 +-
 docker/cassandra/Makefile       | 2 +-
 docker/docker-compose.yml       | 4 ++--
 docker/k8s/cassandra-setup.yaml | 2 +-
 docker/k8s/cassandra.yaml       | 2 +-
 docker/k8s/tb.yaml              | 2 +-
 docker/k8s/zookeeper.yaml       | 2 +-
 docker/tb/Makefile              | 2 +-
 docker/zookeeper/Makefile       | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker/cassandra-setup/Makefile b/docker/cassandra-setup/Makefile
index 12a30a4633..fbe3ff9c2d 100644
--- a/docker/cassandra-setup/Makefile
+++ b/docker/cassandra-setup/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.3.1
+VERSION=1.4.0
 PROJECT=thingsboard
 APP=cassandra-setup
 
diff --git a/docker/cassandra/Dockerfile b/docker/cassandra/Dockerfile
index 9e77f97871..a4e5cc049b 100644
--- a/docker/cassandra/Dockerfile
+++ b/docker/cassandra/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM cassandra:3.9
+FROM cassandra:3.11.2
 
 ADD ready-probe.sh /ready-probe.sh
 
diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile
index b581afdbfb..adc9c7e968 100644
--- a/docker/cassandra/Makefile
+++ b/docker/cassandra/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.3.1
+VERSION=1.4.0
 PROJECT=thingsboard
 APP=cassandra
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7ed12a9ea6..ca0afd7832 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,7 +18,7 @@ version: '2'
 
 services:
   tb:
-    image: "thingsboard/application:1.3.1"
+    image: "thingsboard/application:1.4.0"
     ports:
       - "8080:8080"
       - "1883:1883"
@@ -32,7 +32,7 @@ services:
       - "${HSQLDB_DATA_DIR}:/usr/share/thingsboard/data/sql"
     entrypoint: /run-application.sh
   cassandra:
-    image: "cassandra:3.9"
+    image: "cassandra:3.11.2"
     ports:
       - "9042"
       - "9160"
diff --git a/docker/k8s/cassandra-setup.yaml b/docker/k8s/cassandra-setup.yaml
index 90940e8de6..bf50ba9afe 100644
--- a/docker/k8s/cassandra-setup.yaml
+++ b/docker/k8s/cassandra-setup.yaml
@@ -22,7 +22,7 @@ spec:
   containers:
   - name: cassandra-setup
     imagePullPolicy: Always
-    image: thingsboard/cassandra-setup:1.3.1
+    image: thingsboard/cassandra-setup:1.4.0
     env:
     - name: ADD_DEMO_DATA
       value: "true"
diff --git a/docker/k8s/cassandra.yaml b/docker/k8s/cassandra.yaml
index 4106320bc6..15d0e55eb1 100644
--- a/docker/k8s/cassandra.yaml
+++ b/docker/k8s/cassandra.yaml
@@ -54,7 +54,7 @@ spec:
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: cassandra
-        image: thingsboard/cassandra:1.3.1
+        image: thingsboard/cassandra:1.4.0
         imagePullPolicy: Always
         ports:
         - containerPort: 7000
diff --git a/docker/k8s/tb.yaml b/docker/k8s/tb.yaml
index 3c7d83f7f9..74b6702d3d 100644
--- a/docker/k8s/tb.yaml
+++ b/docker/k8s/tb.yaml
@@ -82,7 +82,7 @@ spec:
       containers:
       - name: tb
         imagePullPolicy: Always
-        image: thingsboard/application:1.3.1
+        image: thingsboard/application:1.4.0
         ports:
         - containerPort: 8080
           name: ui
diff --git a/docker/k8s/zookeeper.yaml b/docker/k8s/zookeeper.yaml
index dd359faae6..bea0833a0a 100644
--- a/docker/k8s/zookeeper.yaml
+++ b/docker/k8s/zookeeper.yaml
@@ -87,7 +87,7 @@ spec:
       containers:
       - name: zk
         imagePullPolicy: Always
-        image: thingsboard/zk:1.3.1
+        image: thingsboard/zk:1.4.0
         ports:
         - containerPort: 2181
           name: client
diff --git a/docker/tb/Makefile b/docker/tb/Makefile
index f30f163d40..05d3f4d2e4 100644
--- a/docker/tb/Makefile
+++ b/docker/tb/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.3.1
+VERSION=1.4.0
 PROJECT=thingsboard
 APP=application
 
diff --git a/docker/zookeeper/Makefile b/docker/zookeeper/Makefile
index 7b99cf58ae..3386ff8586 100644
--- a/docker/zookeeper/Makefile
+++ b/docker/zookeeper/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.3.1
+VERSION=1.4.0
 PROJECT=thingsboard
 APP=zk