thingsboard-memoizeit
Changes
docker/cassandra/cassandra.yaml 2(+1 -1)
docker/cassandra/Dockerfile 23(+23 -0)
docker/cassandra/Makefile 10(+10 -0)
docker/cassandra/ready-probe.sh 28(+28 -0)
docker/tb/Makefile 5(+3 -2)
docker/tb-cassandra-schema/Makefile 5(+3 -2)
docker/zookeeper/Makefile 3(+2 -1)
Details
docker/cassandra/cassandra.yaml 2(+1 -1)
diff --git a/docker/cassandra/cassandra.yaml b/docker/cassandra/cassandra.yaml
index 68379d3..6b4857f 100644
--- a/docker/cassandra/cassandra.yaml
+++ b/docker/cassandra/cassandra.yaml
@@ -54,7 +54,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: cassandra
- image: cassandra:3.9
+ image: thingsboard/cassandra:1.2.4
imagePullPolicy: Always
ports:
- containerPort: 7000
docker/cassandra/Dockerfile 23(+23 -0)
diff --git a/docker/cassandra/Dockerfile b/docker/cassandra/Dockerfile
new file mode 100644
index 0000000..76812cb
--- /dev/null
+++ b/docker/cassandra/Dockerfile
@@ -0,0 +1,23 @@
+#
+# 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
+
+ADD ready-probe.sh /ready-probe.sh
+
+RUN chmod +x /ready-probe.sh
+
+CMD ["cassandra", "-f"]
\ No newline at end of file
docker/cassandra/Makefile 10(+10 -0)
diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile
new file mode 100644
index 0000000..15eb3ed
--- /dev/null
+++ b/docker/cassandra/Makefile
@@ -0,0 +1,10 @@
+VERSION=1.2.4
+PROJECT=thingsboard
+APP=cassandra
+
+build:
+ docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
+
+push: build
+ docker push ${PROJECT}/${APP}:${VERSION}
+ docker push ${PROJECT}/${APP}:latest
\ No newline at end of file
docker/cassandra/ready-probe.sh 28(+28 -0)
diff --git a/docker/cassandra/ready-probe.sh b/docker/cassandra/ready-probe.sh
new file mode 100644
index 0000000..72bd27b
--- /dev/null
+++ b/docker/cassandra/ready-probe.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env 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
docker/tb/Makefile 5(+3 -2)
diff --git a/docker/tb/Makefile b/docker/tb/Makefile
index afd1f80..0d38e51 100644
--- a/docker/tb/Makefile
+++ b/docker/tb/Makefile
@@ -4,8 +4,9 @@ APP=application
build:
cp ../../application/target/thingsboard.deb .
- docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
+ docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
rm thingsboard.deb
push: build
- docker push ${PROJECT}/${APP}:${VERSION}
\ No newline at end of file
+ docker push ${PROJECT}/${APP}:${VERSION}
+ docker push ${PROJECT}/${APP}:latest
\ No newline at end of file
docker/tb-cassandra-schema/Makefile 5(+3 -2)
diff --git a/docker/tb-cassandra-schema/Makefile b/docker/tb-cassandra-schema/Makefile
index c3f2820..68625f4 100644
--- a/docker/tb-cassandra-schema/Makefile
+++ b/docker/tb-cassandra-schema/Makefile
@@ -6,8 +6,9 @@ build:
cp ../../dao/src/main/resources/schema.cql .
cp ../../dao/src/main/resources/demo-data.cql .
cp ../../dao/src/main/resources/system-data.cql .
- docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
+ docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
rm schema.cql demo-data.cql system-data.cql
push: build
- docker push ${PROJECT}/${APP}:${VERSION}
\ No newline at end of file
+ docker push ${PROJECT}/${APP}:${VERSION}
+ docker push ${PROJECT}/${APP}:latest
\ No newline at end of file
diff --git a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
index e1e2722..7b46a2e 100644
--- a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
+++ b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
@@ -25,11 +25,11 @@ spec:
image: thingsboard/tb-cassandra-schema:1.2.4
env:
- name: CREATE_SCHEMA
- value: "false"
+ value: "true"
- name: ADD_SYSTEM_DATA
- value: "false"
+ value: "true"
- name : ADD_DEMO_DATA
- value: "false"
+ value: "true"
- name : CASSANDRA_URL
value: "cassandra-headless"
command:
docker/zookeeper/Makefile 3(+2 -1)
diff --git a/docker/zookeeper/Makefile b/docker/zookeeper/Makefile
index 6e4ef12..911c4f3 100644
--- a/docker/zookeeper/Makefile
+++ b/docker/zookeeper/Makefile
@@ -3,7 +3,8 @@ PROJECT=thingsboard
APP=zk
build:
- docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
+ docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
push: build
docker push ${PROJECT}/${APP}:${VERSION}
+ docker push ${PROJECT}/${APP}:latest
\ No newline at end of file