Commit 0c2342239da70c9fe8a9052077ef5433a3e40718

Authored by Volodymyr Babak
1 parent e5591077

Changed default folder for docker containers

@@ -25,7 +25,7 @@ services: @@ -25,7 +25,7 @@ services:
25 - "5683:5683/udp" 25 - "5683:5683/udp"
26 env_file: 26 env_file:
27 - tb.env 27 - tb.env
28 - entrypoint: ./run-application.sh 28 + entrypoint: /run-application.sh
29 tb-cassandra-schema: 29 tb-cassandra-schema:
30 image: "thingsboard/tb-cassandra-schema:1.2.4" 30 image: "thingsboard/tb-cassandra-schema:1.2.4"
31 environment: 31 environment:
@@ -33,7 +33,7 @@ services: @@ -33,7 +33,7 @@ services:
33 - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA} 33 - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA}
34 - ADD_DEMO_DATA=${ADD_DEMO_DATA} 34 - ADD_DEMO_DATA=${ADD_DEMO_DATA}
35 - CASSANDRA_URL=${CASSANDRA_URL} 35 - CASSANDRA_URL=${CASSANDRA_URL}
36 - entrypoint: ./install-schema.sh 36 + entrypoint: /install-schema.sh
37 cassandra: 37 cassandra:
38 image: "cassandra:3.9" 38 image: "cassandra:3.9"
39 ports: 39 ports:
@@ -16,14 +16,13 @@ @@ -16,14 +16,13 @@
16 16
17 FROM cassandra:3.9 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 RUN apt-get update \ 21 RUN apt-get update \
22 && apt-get install -y nmap \ 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  
@@ -11,4 +11,4 @@ build: @@ -11,4 +11,4 @@ build:
11 11
12 push: build 12 push: build
13 docker push ${PROJECT}/${APP}:${VERSION} 13 docker push ${PROJECT}/${APP}:${VERSION}
14 - docker push ${PROJECT}/${APP}:latest 14 + docker push ${PROJECT}/${APP}:latest
@@ -24,7 +24,7 @@ done @@ -24,7 +24,7 @@ done
24 24
25 if [ "$CREATE_SCHEMA" == "true" ]; then 25 if [ "$CREATE_SCHEMA" == "true" ]; then
26 echo "Creating 'Thingsboard' keyspace..." 26 echo "Creating 'Thingsboard' keyspace..."
27 - cqlsh $CASSANDRA_URL -f /root/schema.cql 27 + cqlsh $CASSANDRA_URL -f /schema.cql
28 if [ "$?" -eq 0 ]; then 28 if [ "$?" -eq 0 ]; then
29 echo "'Thingsboard' keyspace was successfully created!" 29 echo "'Thingsboard' keyspace was successfully created!"
30 else 30 else
@@ -34,7 +34,7 @@ fi @@ -34,7 +34,7 @@ fi
34 34
35 if [ "$ADD_SYSTEM_DATA" == "true" ]; then 35 if [ "$ADD_SYSTEM_DATA" == "true" ]; then
36 echo "Adding system data..." 36 echo "Adding system data..."
37 - cqlsh $CASSANDRA_URL -f /root/system-data.cql 37 + cqlsh $CASSANDRA_URL -f /system-data.cql
38 if [ "$?" -eq 0 ]; then 38 if [ "$?" -eq 0 ]; then
39 echo "System data was successfully added!" 39 echo "System data was successfully added!"
40 else 40 else
@@ -44,7 +44,7 @@ fi @@ -44,7 +44,7 @@ fi
44 44
45 if [ "$ADD_DEMO_DATA" == "true" ]; then 45 if [ "$ADD_DEMO_DATA" == "true" ]; then
46 echo "Adding demo data..." 46 echo "Adding demo data..."
47 - cqlsh $CASSANDRA_URL -f /root/demo-data.cql 47 + cqlsh $CASSANDRA_URL -f /demo-data.cql
48 if [ "$?" -eq 0 ]; then 48 if [ "$?" -eq 0 ]; then
49 echo "Demo data was successfully added!" 49 echo "Demo data was successfully added!"
50 else 50 else
@@ -35,5 +35,5 @@ spec: @@ -35,5 +35,5 @@ spec:
35 command: 35 command:
36 - sh 36 - sh
37 - -c 37 - -c
38 - - ./install-schema.sh 38 + - /install-schema.sh
39 restartPolicy: Never 39 restartPolicy: Never
@@ -16,9 +16,7 @@ @@ -16,9 +16,7 @@
16 16
17 FROM openjdk:8-jre 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
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 # 16 #
17 17
18 18
19 -dpkg -i /root/thingsboard.deb 19 +dpkg -i /thingsboard.deb
20 20
21 reachable=0 21 reachable=0
22 while [ $reachable -eq 0 ]; 22 while [ $reachable -eq 0 ];
@@ -112,7 +112,7 @@ spec: @@ -112,7 +112,7 @@ spec:
112 command: 112 command:
113 - sh 113 - sh
114 - -c 114 - -c
115 - - ./run-application.sh 115 + - /run-application.sh
116 livenessProbe: 116 livenessProbe:
117 httpGet: 117 httpGet:
118 path: /login 118 path: /login