thingsboard-memoizeit
Changes
docker/.env 3(+2 -1)
docker/docker-compose.random.yml 2(+1 -1)
docker/docker-compose.static.yml 2(+1 -1)
docker/docker-compose.yml 23(+12 -11)
docker/tb.env 2(+1 -1)
docker/tb/Dockerfile 4(+2 -2)
docker/tb/Makefile 0(+0 -0)
docker/tb/run-application.sh 6(+3 -3)
docker/tb/tb.yaml 2(+1 -1)
docker/tb-cassandra-schema/Makefile 2(+1 -1)
docker/zookeeper/Dockerfile 2(+1 -1)
docker/zookeeper/zk-gen-config.sh 0(+0 -0)
docker/zookeeper/zk-ok.sh 2(+1 -1)
docker/zookeeper/zookeeper.yaml 6(+3 -3)
Details
docker/.env 3(+2 -1)
diff --git a/docker/.env b/docker/.env
index f7cecd9..c03637e 100644
--- a/docker/.env
+++ b/docker/.env
@@ -3,4 +3,5 @@ CASSANDRA_DATA_DIR=/home/docker/cassandra_volume
# cassandra schema container environment variables
SKIP_SCHEMA_CREATION=false
SKIP_SYSTEM_DATA=true
-SKIP_DEMO_DATA=true
\ No newline at end of file
+SKIP_DEMO_DATA=true
+CASSANDRA_URL=cassandra
\ No newline at end of file
docker/docker-compose.random.yml 2(+1 -1)
diff --git a/docker/docker-compose.random.yml b/docker/docker-compose.random.yml
index 0e60e08..f066c5c 100644
--- a/docker/docker-compose.random.yml
+++ b/docker/docker-compose.random.yml
@@ -17,7 +17,7 @@
version: '2'
services:
- db:
+ cassandra:
ports:
- "9042"
- "9160"
docker/docker-compose.static.yml 2(+1 -1)
diff --git a/docker/docker-compose.static.yml b/docker/docker-compose.static.yml
index 80cc6a9..5471cb2 100644
--- a/docker/docker-compose.static.yml
+++ b/docker/docker-compose.static.yml
@@ -17,7 +17,7 @@
version: '2'
services:
- db:
+ cassandra:
ports:
- "9042:9042"
- "9160:9160"
docker/docker-compose.yml 23(+12 -11)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 893b02f..4980804 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -17,26 +17,27 @@
version: '2'
services:
- thingsboard:
- image: "thingsboard/application:1.2.3"
+ tb:
+ image: "thingsboard/application:k8stest"
ports:
- "8080:8080"
- - "1883:1883"
+ - "1884:1883"
- "5683:5683/udp"
env_file:
- - thingsboard.env
- entrypoint: ./run_thingsboard.sh
- thingsboard-db-schema:
- image: "thingsboard/thingsboard-db-schema:1.2.3"
+ - tb.env
+ entrypoint: ./run-application.sh
+ tb-cassandra-schema:
+ image: "thingsboard/tb-cassandra-schema:k8stest"
environment:
- SKIP_SCHEMA_CREATION=${SKIP_SCHEMA_CREATION}
- SKIP_SYSTEM_DATA=${SKIP_SYSTEM_DATA}
- SKIP_DEMO_DATA=${SKIP_DEMO_DATA}
- entrypoint: ./install_schema.sh
- db:
- image: "cassandra:3.9"
+ - CASSANDRA_URL=${CASSANDRA_URL}
+ entrypoint: ./install-schema.sh
+ cassandra:
+ image: "thingsboard/cassandra:k8stest"
volumes:
- "${CASSANDRA_DATA_DIR}:/var/lib/cassandra"
zk:
- image: "zookeeper:3.4.9"
+ image: "thingsboard/zk:k8stest"
restart: always
docker/zookeeper/Dockerfile 2(+1 -1)
diff --git a/docker/zookeeper/Dockerfile b/docker/zookeeper/Dockerfile
index 7d3480e..5ec1ac9 100644
--- a/docker/zookeeper/Dockerfile
+++ b/docker/zookeeper/Dockerfile
@@ -55,7 +55,7 @@ RUN set -x \
&& rm -rf /var/lib/apt/lists/*
#Copy configuration generator script to bin
-COPY zkGenConfig.sh zkOk.sh /opt/zookeeper/bin/
+COPY zk-gen-config.sh zk-ok.sh /opt/zookeeper/bin/
# Create a user for the zookeeper process and configure file system ownership
# for nessecary directories and symlink the distribution as a user executable
docker/zookeeper/zookeeper.yaml 6(+3 -3)
diff --git a/docker/zookeeper/zookeeper.yaml b/docker/zookeeper/zookeeper.yaml
index 062d8cc..4b8501d 100644
--- a/docker/zookeeper/zookeeper.yaml
+++ b/docker/zookeeper/zookeeper.yaml
@@ -159,17 +159,17 @@ spec:
command:
- sh
- -c
- - zkGenConfig.sh && zkServer.sh start-foreground
+ - zk-gen-config.sh && zkServer.sh start-foreground
readinessProbe:
exec:
command:
- - "zkOk.sh"
+ - "zk-ok.sh"
initialDelaySeconds: 15
timeoutSeconds: 5
livenessProbe:
exec:
command:
- - "zkOk.sh"
+ - "zk-ok.sh"
initialDelaySeconds: 15
timeoutSeconds: 5
volumeMounts: