Commit 0c2342239da70c9fe8a9052077ef5433a3e40718
1 parent
e5591077
Changed default folder for docker containers
Showing
8 changed files
with
17 additions
and
20 deletions
... | ... | @@ -25,7 +25,7 @@ services: |
25 | 25 | - "5683:5683/udp" |
26 | 26 | env_file: |
27 | 27 | - tb.env |
28 | - entrypoint: ./run-application.sh | |
28 | + entrypoint: /run-application.sh | |
29 | 29 | tb-cassandra-schema: |
30 | 30 | image: "thingsboard/tb-cassandra-schema:1.2.4" |
31 | 31 | environment: |
... | ... | @@ -33,7 +33,7 @@ services: |
33 | 33 | - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA} |
34 | 34 | - ADD_DEMO_DATA=${ADD_DEMO_DATA} |
35 | 35 | - CASSANDRA_URL=${CASSANDRA_URL} |
36 | - entrypoint: ./install-schema.sh | |
36 | + entrypoint: /install-schema.sh | |
37 | 37 | cassandra: |
38 | 38 | image: "cassandra:3.9" |
39 | 39 | ports: | ... | ... |
... | ... | @@ -16,14 +16,13 @@ |
16 | 16 | |
17 | 17 | FROM cassandra:3.9 |
18 | 18 | |
19 | -ADD install-schema.sh /root/install-schema.sh | |
19 | +ADD install-schema.sh /install-schema.sh | |
20 | 20 | |
21 | 21 | RUN apt-get update \ |
22 | 22 | && apt-get install -y nmap \ |
23 | - && chmod +x /root/install-schema.sh | |
23 | + && chmod +x /install-schema.sh | |
24 | 24 | |
25 | -ADD schema.cql /root/schema.cql | |
26 | -ADD demo-data.cql /root/demo-data.cql | |
27 | -ADD system-data.cql /root/system-data.cql | |
25 | +ADD schema.cql /schema.cql | |
26 | +ADD demo-data.cql /demo-data.cql | |
27 | +ADD system-data.cql /system-data.cql | |
28 | 28 | |
29 | -WORKDIR /root | ... | ... |
... | ... | @@ -24,7 +24,7 @@ done |
24 | 24 | |
25 | 25 | if [ "$CREATE_SCHEMA" == "true" ]; then |
26 | 26 | echo "Creating 'Thingsboard' keyspace..." |
27 | - cqlsh $CASSANDRA_URL -f /root/schema.cql | |
27 | + cqlsh $CASSANDRA_URL -f /schema.cql | |
28 | 28 | if [ "$?" -eq 0 ]; then |
29 | 29 | echo "'Thingsboard' keyspace was successfully created!" |
30 | 30 | else |
... | ... | @@ -34,7 +34,7 @@ fi |
34 | 34 | |
35 | 35 | if [ "$ADD_SYSTEM_DATA" == "true" ]; then |
36 | 36 | echo "Adding system data..." |
37 | - cqlsh $CASSANDRA_URL -f /root/system-data.cql | |
37 | + cqlsh $CASSANDRA_URL -f /system-data.cql | |
38 | 38 | if [ "$?" -eq 0 ]; then |
39 | 39 | echo "System data was successfully added!" |
40 | 40 | else |
... | ... | @@ -44,7 +44,7 @@ fi |
44 | 44 | |
45 | 45 | if [ "$ADD_DEMO_DATA" == "true" ]; then |
46 | 46 | echo "Adding demo data..." |
47 | - cqlsh $CASSANDRA_URL -f /root/demo-data.cql | |
47 | + cqlsh $CASSANDRA_URL -f /demo-data.cql | |
48 | 48 | if [ "$?" -eq 0 ]; then |
49 | 49 | echo "Demo data was successfully added!" |
50 | 50 | else | ... | ... |
... | ... | @@ -16,9 +16,7 @@ |
16 | 16 | |
17 | 17 | FROM openjdk:8-jre |
18 | 18 | |
19 | -ADD run-application.sh /root/run-application.sh | |
20 | -ADD thingsboard.deb /root/thingsboard.deb | |
19 | +ADD run-application.sh /run-application.sh | |
20 | +ADD thingsboard.deb /thingsboard.deb | |
21 | 21 | |
22 | -RUN chmod +x /root/run-application.sh | |
23 | - | |
24 | -WORKDIR /root | |
22 | +RUN chmod +x /run-application.sh | ... | ... |