Showing
4 changed files
with
17 additions
and
6 deletions
@@ -31,15 +31,11 @@ services: | @@ -31,15 +31,11 @@ services: | ||
31 | - thingsboard.env | 31 | - thingsboard.env |
32 | entrypoint: ./run_thingsboard.sh | 32 | entrypoint: ./run_thingsboard.sh |
33 | thingsboard-db-schema: | 33 | thingsboard-db-schema: |
34 | - build: thingsboard-db-schema | 34 | + image: "thingsboard/thingsboard-db-schema:0.1" |
35 | links: | 35 | links: |
36 | - cassandra:db | 36 | - cassandra:db |
37 | env_file: | 37 | env_file: |
38 | - thingsboard-db-schema.env | 38 | - thingsboard-db-schema.env |
39 | - volumes: | ||
40 | - - "../dao/src/main/resources/schema.cql:/root/schema.cql" | ||
41 | - - "../dao/src/main/resources/demo-data.cql:/root/demo-data.cql" | ||
42 | - - "../dao/src/main/resources/system-data.cql:/root/system-data.cql" | ||
43 | entrypoint: ./install_schema.sh | 39 | entrypoint: ./install_schema.sh |
44 | cassandra: | 40 | cassandra: |
45 | image: "cassandra:3.9" | 41 | image: "cassandra:3.9" |
@@ -23,4 +23,8 @@ RUN apt-get update \ | @@ -23,4 +23,8 @@ RUN apt-get update \ | ||
23 | 23 | ||
24 | RUN chmod +x /root/install_schema.sh | 24 | RUN chmod +x /root/install_schema.sh |
25 | 25 | ||
26 | +ADD schema.cql /root/schema.cql | ||
27 | +ADD demo-data.cql /root/demo-data.cql | ||
28 | +ADD system-data.cql /root/system-data.cql | ||
29 | + | ||
26 | WORKDIR /root | 30 | WORKDIR /root |
1 | +#!/bin/bash | ||
2 | + | ||
3 | +cp ../../dao/src/main/resources/schema.cql schema.cql | ||
4 | +cp ../../dao/src/main/resources/demo-data.cql demo-data.cql | ||
5 | +cp ../../dao/src/main/resources/system-data.cql system-data.cql | ||
6 | + | ||
7 | +docker build -t thingsboard/thingsboard-db-schema:0.1 . | ||
8 | + | ||
9 | +docker login | ||
10 | + | ||
11 | +docker push thingsboard/thingsboard-db-schema:0.1 |
@@ -40,5 +40,5 @@ echo "Starting 'Thingsboard' service..." | @@ -40,5 +40,5 @@ echo "Starting 'Thingsboard' service..." | ||
40 | service thingsboard start | 40 | service thingsboard start |
41 | 41 | ||
42 | # Wait until log file is created | 42 | # Wait until log file is created |
43 | -sleep 3 | 43 | +sleep 10 |
44 | tail -f /var/log/thingsboard/thingsboard.log | 44 | tail -f /var/log/thingsboard/thingsboard.log |