简柏林 / thingskit · Commits

Commit 54215215c5b60c0bb17b5114b139016d74430b40

Authored by Andrew Shvayka
Committed by GitHub
2 parents cb3cb2cd 301600ff

Merge pull request #12 from volodymyr-babak/master 

removed redundant links
Inline Side-by-side
Showing 4 changed files with 7 additions and 13 deletions
@@ -28,4 +28,4 @@ echo "building images.." @@ -28,4 +28,4 @@ echo "building images.."
28 $command build 28 $command build
29 29
30 echo "starting cassandra, zookeeper, thingsboard-db-schema images..." 30 echo "starting cassandra, zookeeper, thingsboard-db-schema images..."
31 -$command up -d cassandra zookeeper thingsboard-db-schema 31 +$command up -d db zk thingsboard-db-schema
@@ -17,10 +17,10 @@ @@ -17,10 +17,10 @@
17 version: '2' 17 version: '2'
18 18
19 services: 19 services:
20 - cassandra: 20 + db:
21 ports: 21 ports:
22 - "9042" 22 - "9042"
23 - "9160" 23 - "9160"
24 - zookeeper: 24 + zk:
25 ports: 25 ports:
26 - "2181" 26 - "2181"
@@ -17,10 +17,10 @@ @@ -17,10 +17,10 @@
17 version: '2' 17 version: '2'
18 18
19 services: 19 services:
20 - cassandra: 20 + db:
21 ports: 21 ports:
22 - "9042:9042" 22 - "9042:9042"
23 - "9160:9160" 23 - "9160:9160"
24 - zookeeper: 24 + zk:
25 ports: 25 ports:
26 - "2181:2181" 26 - "2181:2181"
@@ -23,24 +23,18 @@ services: @@ -23,24 +23,18 @@ services:
23 - "8080:8080" 23 - "8080:8080"
24 - "1883:1883" 24 - "1883:1883"
25 - "5683:5683" 25 - "5683:5683"
26 - links:  
27 - - cassandra:db  
28 - - zookeeper:zk  
29 - - thingsboard-db-schema:thingsboard-db-schema  
30 env_file: 26 env_file:
31 - thingsboard.env 27 - thingsboard.env
32 entrypoint: ./run_thingsboard.sh 28 entrypoint: ./run_thingsboard.sh
33 thingsboard-db-schema: 29 thingsboard-db-schema:
34 image: "thingsboard/thingsboard-db-schema:1.0" 30 image: "thingsboard/thingsboard-db-schema:1.0"
35 - links:  
36 - - cassandra:db  
37 env_file: 31 env_file:
38 - thingsboard-db-schema.env 32 - thingsboard-db-schema.env
39 entrypoint: ./install_schema.sh 33 entrypoint: ./install_schema.sh
40 - cassandra: 34 + db:
41 image: "cassandra:3.9" 35 image: "cassandra:3.9"
42 volumes: 36 volumes:
43 - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra" 37 - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra"
44 - zookeeper: 38 + zk:
45 image: "zookeeper:3.4.9" 39 image: "zookeeper:3.4.9"
46 restart: always 40 restart: always