thingsboard-developers
Changes
docker/.env 1(+1 -0)
docker/deploy_cassandra_zookeeper.sh 4(+2 -2)
docker/docker-compose.yml 4(+1 -3)
docker/thingsboard/Dockerfile 1(+1 -0)
Details
docker/.env 1(+1 -0)
diff --git a/docker/.env b/docker/.env
new file mode 100644
index 0000000..ca7f2b0
--- /dev/null
+++ b/docker/.env
@@ -0,0 +1 @@
+CASSANDRA_DATA_DIR=/home/docker/cassandra_volume
docker/deploy_cassandra_zookeeper.sh 4(+2 -2)
diff --git a/docker/deploy_cassandra_zookeeper.sh b/docker/deploy_cassandra_zookeeper.sh
index 6c4cc50..263ef49 100755
--- a/docker/deploy_cassandra_zookeeper.sh
+++ b/docker/deploy_cassandra_zookeeper.sh
@@ -27,5 +27,5 @@ $command rm -f
echo "building images.."
$command build
-echo "starting cassandra, zookeeper, db-schema images..."
-$command up -d cassandra zookeeper db-schema
+echo "starting cassandra, zookeeper, thingsboard-db-schema images..."
+$command up -d cassandra zookeeper thingsboard-db-schema
docker/docker-compose.yml 4(+1 -3)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 65b0aa7..fd1c0a1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,7 +18,7 @@ version: '2'
services:
thingsboard:
- build: thingsboard
+ image: "thingsboard/application:0.1"
ports:
- "8080:8080"
- "1883:1883"
@@ -27,8 +27,6 @@ services:
- cassandra:db
- zookeeper:zk
- thingsboard-db-schema:thingsboard-db-schema
- volumes:
- - "../application/target/thingsboard.deb:/root/thingsboard.deb"
env_file:
- thingsboard.env
entrypoint: ./run_thingsboard.sh
diff --git a/docker/thingsboard/build_and_deploy.sh b/docker/thingsboard/build_and_deploy.sh
new file mode 100755
index 0000000..20f2903
--- /dev/null
+++ b/docker/thingsboard/build_and_deploy.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cp ../../application/target/thingsboard.deb thingsboard.deb
+
+docker build -t thingsboard/application:0.1 .
+
+docker login
+
+docker push thingsboard/application:0.1
\ No newline at end of file
docker/thingsboard/Dockerfile 1(+1 -0)
diff --git a/docker/thingsboard/Dockerfile b/docker/thingsboard/Dockerfile
index c145939..1587d79 100644
--- a/docker/thingsboard/Dockerfile
+++ b/docker/thingsboard/Dockerfile
@@ -17,6 +17,7 @@
FROM openjdk:8-jre
ADD run_thingsboard.sh /root/run_thingsboard.sh
+ADD thingsboard.deb /root/thingsboard.deb
RUN chmod +x /root/run_thingsboard.sh