Commit 95ddde3e38729eae530b67d069bdfdbbd08e1055

Authored by YevhenBondarenko
Committed by Andrew Shvayka
1 parent 7e66fd26

added docker-compose and environment for queues

  1 +TB_QUEUE_TYPE=kafka
1 2
2 3 DOCKER_REPO=thingsboard
3 4
... ...
... ... @@ -32,6 +32,32 @@ function additionalComposeArgs() {
32 32 echo $ADDITIONAL_COMPOSE_ARGS
33 33 }
34 34
  35 +function additionalComposeQueueArgs() {
  36 + source .env
  37 + ADDITIONAL_COMPOSE_QUEUE_ARGS=""
  38 + case $TB_QUEUE_TYPE in
  39 + kafka)
  40 + ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.kafka.yml"
  41 + ;;
  42 + aws-sqs)
  43 + ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.aws-sqs.yml"
  44 + ;;
  45 + pubsub)
  46 + ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.pubsub.yml"
  47 + ;;
  48 + rabbitmq)
  49 + ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.rabbitmq.yml"
  50 + ;;
  51 + service-bus)
  52 + ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.service-bus.yml"
  53 + ;;
  54 + *)
  55 + echo "Unknown Queue service value specified: '${TB_QUEUE_TYPE}'. Should be either kafka or aws-sqs or pubsub or rabbitmq or service-bus." >&2
  56 + exit 1
  57 + esac
  58 + echo $ADDITIONAL_COMPOSE_QUEUE_ARGS
  59 +}
  60 +
35 61 function additionalStartupServices() {
36 62 source .env
37 63 ADDITIONAL_STARTUP_SERVICES=""
... ...
  1 +#
  2 +# Copyright © 2016-2020 The Thingsboard Authors
  3 +#
  4 +# Licensed under the Apache License, Version 2.0 (the "License");
  5 +# you may not use this file except in compliance with the License.
  6 +# You may obtain a copy of the License at
  7 +#
  8 +# http://www.apache.org/licenses/LICENSE-2.0
  9 +#
  10 +# Unless required by applicable law or agreed to in writing, software
  11 +# distributed under the License is distributed on an "AS IS" BASIS,
  12 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 +# See the License for the specific language governing permissions and
  14 +# limitations under the License.
  15 +#
  16 +
  17 +version: '2.2'
  18 +
  19 +services:
  20 + tb-js-executor:
  21 + env_file:
  22 + - queue-aws-sqs.env
  23 + tb-core1:
  24 + env_file:
  25 + - queue-aws-sqs.env
  26 + depends_on:
  27 + - zookeeper
  28 + - redis
  29 + tb-core2:
  30 + env_file:
  31 + - queue-aws-sqs.env
  32 + depends_on:
  33 + - zookeeper
  34 + - redis
  35 + tb-rule-engine1:
  36 + env_file:
  37 + - queue-aws-sqs.env
  38 + depends_on:
  39 + - zookeeper
  40 + - redis
  41 + tb-rule-engine2:
  42 + env_file:
  43 + - queue-aws-sqs.env
  44 + depends_on:
  45 + - zookeeper
  46 + - redis
  47 + tb-mqtt-transport1:
  48 + env_file:
  49 + - queue-aws-sqs.env
  50 + depends_on:
  51 + - zookeeper
  52 + tb-mqtt-transport2:
  53 + env_file:
  54 + - queue-aws-sqs.env
  55 + depends_on:
  56 + - zookeeper
  57 + tb-http-transport1:
  58 + env_file:
  59 + - queue-aws-sqs.env
  60 + depends_on:
  61 + - zookeeper
  62 + tb-http-transport2:
  63 + env_file:
  64 + - queue-aws-sqs.env
  65 + depends_on:
  66 + - zookeeper
  67 + tb-coap-transport:
  68 + env_file:
  69 + - queue-aws-sqs.env
  70 + depends_on:
  71 + - zookeeper
\ No newline at end of file
... ...
... ... @@ -28,27 +28,27 @@ services:
28 28 env_file:
29 29 - tb-node.cassandra.env
30 30 depends_on:
31   - - kafka
  31 + - zookeeper
32 32 - redis
33 33 - cassandra
34 34 tb-core2:
35 35 env_file:
36 36 - tb-node.cassandra.env
37 37 depends_on:
38   - - kafka
  38 + - zookeeper
39 39 - redis
40 40 - cassandra
41 41 tb-rule-engine1:
42 42 env_file:
43 43 - tb-node.cassandra.env
44 44 depends_on:
45   - - kafka
  45 + - zookeeper
46 46 - redis
47 47 - cassandra
48 48 tb-rule-engine2:
49 49 env_file:
50 50 - tb-node.cassandra.env
51 51 depends_on:
52   - - kafka
  52 + - zookeeper
53 53 - redis
54 54 - cassandra
... ...
  1 +#
  2 +# Copyright © 2016-2020 The Thingsboard Authors
  3 +#
  4 +# Licensed under the Apache License, Version 2.0 (the "License");
  5 +# you may not use this file except in compliance with the License.
  6 +# You may obtain a copy of the License at
  7 +#
  8 +# http://www.apache.org/licenses/LICENSE-2.0
  9 +#
  10 +# Unless required by applicable law or agreed to in writing, software
  11 +# distributed under the License is distributed on an "AS IS" BASIS,
  12 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 +# See the License for the specific language governing permissions and
  14 +# limitations under the License.
  15 +#
  16 +
  17 +version: '2.2'
  18 +
  19 +services:
  20 + kafka:
  21 + restart: always
  22 + image: "wurstmeister/kafka:2.12-2.3.0"
  23 + ports:
  24 + - "9092:9092"
  25 + env_file:
  26 + - kafka.env
  27 + depends_on:
  28 + - zookeeper
  29 + tb-js-executor:
  30 + env_file:
  31 + - queue-kafka.env
  32 + depends_on:
  33 + - kafka
  34 + tb-core1:
  35 + env_file:
  36 + - queue-kafka.env
  37 + depends_on:
  38 + - kafka
  39 + - redis
  40 + tb-core2:
  41 + env_file:
  42 + - queue-kafka.env
  43 + depends_on:
  44 + - kafka
  45 + - redis
  46 + tb-rule-engine1:
  47 + env_file:
  48 + - queue-kafka.env
  49 + depends_on:
  50 + - kafka
  51 + - redis
  52 + tb-rule-engine2:
  53 + env_file:
  54 + - queue-kafka.env
  55 + depends_on:
  56 + - kafka
  57 + - redis
  58 + tb-mqtt-transport1:
  59 + env_file:
  60 + - queue-kafka.env
  61 + depends_on:
  62 + - kafka
  63 + tb-mqtt-transport2:
  64 + env_file:
  65 + - queue-kafka.env
  66 + depends_on:
  67 + - kafka
  68 + tb-http-transport1:
  69 + env_file:
  70 + - queue-kafka.env
  71 + depends_on:
  72 + - kafka
  73 + tb-http-transport2:
  74 + env_file:
  75 + - queue-kafka.env
  76 + depends_on:
  77 + - kafka
  78 + tb-coap-transport:
  79 + env_file:
  80 + - queue-kafka.env
  81 + depends_on:
  82 + - kafka
... ...
... ... @@ -31,27 +31,27 @@ services:
31 31 env_file:
32 32 - tb-node.postgres.env
33 33 depends_on:
34   - - kafka
  34 + - zookeeper
35 35 - redis
36 36 - postgres
37 37 tb-core2:
38 38 env_file:
39 39 - tb-node.postgres.env
40 40 depends_on:
41   - - kafka
  41 + - zookeeper
42 42 - redis
43 43 - postgres
44 44 tb-rule-engine1:
45 45 env_file:
46 46 - tb-node.postgres.env
47 47 depends_on:
48   - - kafka
  48 + - zookeeper
49 49 - redis
50 50 - postgres
51 51 tb-rule-engine2:
52 52 env_file:
53 53 - tb-node.postgres.env
54 54 depends_on:
55   - - kafka
  55 + - zookeeper
56 56 - redis
57 57 - postgres
... ...
  1 +#
  2 +# Copyright © 2016-2020 The Thingsboard Authors
  3 +#
  4 +# Licensed under the Apache License, Version 2.0 (the "License");
  5 +# you may not use this file except in compliance with the License.
  6 +# You may obtain a copy of the License at
  7 +#
  8 +# http://www.apache.org/licenses/LICENSE-2.0
  9 +#
  10 +# Unless required by applicable law or agreed to in writing, software
  11 +# distributed under the License is distributed on an "AS IS" BASIS,
  12 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 +# See the License for the specific language governing permissions and
  14 +# limitations under the License.
  15 +#
  16 +
  17 +version: '2.2'
  18 +
  19 +services:
  20 + tb-js-executor:
  21 + env_file:
  22 + - queue-pubsub.env.env
  23 + tb-core1:
  24 + env_file:
  25 + - queue-pubsub.env.env
  26 + depends_on:
  27 + - zookeeper
  28 + - redis
  29 + tb-core2:
  30 + env_file:
  31 + - queue-pubsub.env
  32 + depends_on:
  33 + - zookeeper
  34 + - redis
  35 + tb-rule-engine1:
  36 + env_file:
  37 + - queue-pubsub.env
  38 + depends_on:
  39 + - zookeeper
  40 + - redis
  41 + tb-rule-engine2:
  42 + env_file:
  43 + - queue-pubsub.env
  44 + depends_on:
  45 + - zookeeper
  46 + - redis
  47 + tb-mqtt-transport1:
  48 + env_file:
  49 + - queue-pubsub.env
  50 + depends_on:
  51 + - zookeeper
  52 + tb-mqtt-transport2:
  53 + env_file:
  54 + - queue-pubsub.env
  55 + depends_on:
  56 + - zookeeper
  57 + tb-http-transport1:
  58 + env_file:
  59 + - queue-pubsub.env
  60 + depends_on:
  61 + - zookeeper
  62 + tb-http-transport2:
  63 + env_file:
  64 + - queue-pubsub.env
  65 + depends_on:
  66 + - zookeeper
  67 + tb-coap-transport:
  68 + env_file:
  69 + - queue-pubsub.env
  70 + depends_on:
  71 + - zookeeper
... ...
  1 +#
  2 +# Copyright © 2016-2020 The Thingsboard Authors
  3 +#
  4 +# Licensed under the Apache License, Version 2.0 (the "License");
  5 +# you may not use this file except in compliance with the License.
  6 +# You may obtain a copy of the License at
  7 +#
  8 +# http://www.apache.org/licenses/LICENSE-2.0
  9 +#
  10 +# Unless required by applicable law or agreed to in writing, software
  11 +# distributed under the License is distributed on an "AS IS" BASIS,
  12 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 +# See the License for the specific language governing permissions and
  14 +# limitations under the License.
  15 +#
  16 +
  17 +version: '2.2'
  18 +
  19 +services:
  20 + tb-js-executor:
  21 + env_file:
  22 + - queue-rabbitmq.env
  23 + tb-core1:
  24 + env_file:
  25 + - queue-rabbitmq.env
  26 + depends_on:
  27 + - zookeeper
  28 + - redis
  29 + tb-core2:
  30 + env_file:
  31 + - queue-rabbitmq.env
  32 + depends_on:
  33 + - zookeeper
  34 + - redis
  35 + tb-rule-engine1:
  36 + env_file:
  37 + - queue-rabbitmq.env
  38 + depends_on:
  39 + - zookeeper
  40 + - redis
  41 + tb-rule-engine2:
  42 + env_file:
  43 + - queue-rabbitmq.env
  44 + depends_on:
  45 + - zookeeper
  46 + - redis
  47 + tb-mqtt-transport1:
  48 + env_file:
  49 + - queue-rabbitmq.env
  50 + depends_on:
  51 + - zookeeper
  52 + tb-mqtt-transport2:
  53 + env_file:
  54 + - queue-rabbitmq.env
  55 + depends_on:
  56 + - zookeeper
  57 + tb-http-transport1:
  58 + env_file:
  59 + - queue-rabbitmq.env
  60 + depends_on:
  61 + - zookeeper
  62 + tb-http-transport2:
  63 + env_file:
  64 + - queue-rabbitmq.env
  65 + depends_on:
  66 + - zookeeper
  67 + tb-coap-transport:
  68 + env_file:
  69 + - queue-rabbitmq.env
  70 + depends_on:
  71 + - zookeeper
\ No newline at end of file
... ...
  1 +#
  2 +# Copyright © 2016-2020 The Thingsboard Authors
  3 +#
  4 +# Licensed under the Apache License, Version 2.0 (the "License");
  5 +# you may not use this file except in compliance with the License.
  6 +# You may obtain a copy of the License at
  7 +#
  8 +# http://www.apache.org/licenses/LICENSE-2.0
  9 +#
  10 +# Unless required by applicable law or agreed to in writing, software
  11 +# distributed under the License is distributed on an "AS IS" BASIS,
  12 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 +# See the License for the specific language governing permissions and
  14 +# limitations under the License.
  15 +#
  16 +
  17 +version: '2.2'
  18 +
  19 +services:
  20 + tb-js-executor:
  21 + env_file:
  22 + - queue-service-bus.env
  23 + tb-core1:
  24 + env_file:
  25 + - queue-service-bus.env
  26 + depends_on:
  27 + - zookeeper
  28 + - redis
  29 + tb-core2:
  30 + env_file:
  31 + - queue-service-bus.env
  32 + depends_on:
  33 + - zookeeper
  34 + - redis
  35 + tb-rule-engine1:
  36 + env_file:
  37 + - queue-service-bus.env
  38 + depends_on:
  39 + - zookeeper
  40 + - redis
  41 + tb-rule-engine2:
  42 + env_file:
  43 + - queue-service-bus.env
  44 + depends_on:
  45 + - zookeeper
  46 + - redis
  47 + tb-mqtt-transport1:
  48 + env_file:
  49 + - queue-service-bus.env
  50 + depends_on:
  51 + - zookeeper
  52 + tb-mqtt-transport2:
  53 + env_file:
  54 + - queue-service-bus.env
  55 + depends_on:
  56 + - zookeeper
  57 + tb-http-transport1:
  58 + env_file:
  59 + - queue-service-bus.env
  60 + depends_on:
  61 + - zookeeper
  62 + tb-http-transport2:
  63 + env_file:
  64 + - queue-service-bus.env
  65 + depends_on:
  66 + - zookeeper
  67 + tb-coap-transport:
  68 + env_file:
  69 + - queue-service-bus.env
  70 + depends_on:
  71 + - zookeeper
\ No newline at end of file
... ...
... ... @@ -26,15 +26,6 @@ services:
26 26 environment:
27 27 ZOO_MY_ID: 1
28 28 ZOO_SERVERS: server.1=zookeeper:2888:3888;zookeeper:2181
29   - kafka:
30   - restart: always
31   - image: "wurstmeister/kafka:2.12-2.3.0"
32   - ports:
33   - - "9092:9092"
34   - env_file:
35   - - kafka.env
36   - depends_on:
37   - - zookeeper
38 29 redis:
39 30 restart: always
40 31 image: redis:4.0
... ... @@ -43,11 +34,9 @@ services:
43 34 tb-js-executor:
44 35 restart: always
45 36 image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
46   - scale: 20
  37 + scale: 2
47 38 env_file:
48 39 - tb-js-executor.env
49   - depends_on:
50   - - kafka
51 40 tb-core1:
52 41 restart: always
53 42 image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}"
... ... @@ -67,7 +56,7 @@ services:
67 56 - ./tb-node/conf:/config
68 57 - ./tb-node/log:/var/log/thingsboard
69 58 depends_on:
70   - - kafka
  59 + - zookeeper
71 60 - redis
72 61 - tb-js-executor
73 62 - tb-rule-engine1
... ... @@ -91,7 +80,7 @@ services:
91 80 - ./tb-node/conf:/config
92 81 - ./tb-node/log:/var/log/thingsboard
93 82 depends_on:
94   - - kafka
  83 + - zookeeper
95 84 - redis
96 85 - tb-js-executor
97 86 - tb-rule-engine1
... ... @@ -115,7 +104,7 @@ services:
115 104 - ./tb-node/conf:/config
116 105 - ./tb-node/log:/var/log/thingsboard
117 106 depends_on:
118   - - kafka
  107 + - zookeeper
119 108 - redis
120 109 - tb-js-executor
121 110 tb-rule-engine2:
... ... @@ -137,7 +126,7 @@ services:
137 126 - ./tb-node/conf:/config
138 127 - ./tb-node/log:/var/log/thingsboard
139 128 depends_on:
140   - - kafka
  129 + - zookeeper
141 130 - redis
142 131 - tb-js-executor
143 132 tb-mqtt-transport1:
... ... @@ -153,7 +142,7 @@ services:
153 142 - ./tb-transports/mqtt/conf:/config
154 143 - ./tb-transports/mqtt/log:/var/log/tb-mqtt-transport
155 144 depends_on:
156   - - kafka
  145 + - zookeeper
157 146 tb-mqtt-transport2:
158 147 restart: always
159 148 image: "${DOCKER_REPO}/${MQTT_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
... ... @@ -167,7 +156,7 @@ services:
167 156 - ./tb-transports/mqtt/conf:/config
168 157 - ./tb-transports/mqtt/log:/var/log/tb-mqtt-transport
169 158 depends_on:
170   - - kafka
  159 + - zookeeper
171 160 tb-http-transport1:
172 161 restart: always
173 162 image: "${DOCKER_REPO}/${HTTP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
... ... @@ -181,7 +170,7 @@ services:
181 170 - ./tb-transports/http/conf:/config
182 171 - ./tb-transports/http/log:/var/log/tb-http-transport
183 172 depends_on:
184   - - kafka
  173 + - zookeeper
185 174 tb-http-transport2:
186 175 restart: always
187 176 image: "${DOCKER_REPO}/${HTTP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
... ... @@ -195,7 +184,7 @@ services:
195 184 - ./tb-transports/http/conf:/config
196 185 - ./tb-transports/http/log:/var/log/tb-http-transport
197 186 depends_on:
198   - - kafka
  187 + - zookeeper
199 188 tb-coap-transport:
200 189 restart: always
201 190 image: "${DOCKER_REPO}/${COAP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
... ... @@ -209,7 +198,7 @@ services:
209 198 - ./tb-transports/coap/conf:/config
210 199 - ./tb-transports/coap/log:/var/log/tb-coap-transport
211 200 depends_on:
212   - - kafka
  201 + - zookeeper
213 202 tb-web-ui1:
214 203 restart: always
215 204 image: "${DOCKER_REPO}/${WEB_UI_DOCKER_NAME}:${TB_VERSION}"
... ...
... ... @@ -41,14 +41,16 @@ set -e
41 41
42 42 source compose-utils.sh
43 43
  44 +ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
  45 +
44 46 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
45 47
46 48 ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
47 49
48 50 if [ ! -z "${ADDITIONAL_STARTUP_SERVICES// }" ]; then
49   - docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS up -d redis $ADDITIONAL_STARTUP_SERVICES
  51 + docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d redis $ADDITIONAL_STARTUP_SERVICES
50 52 fi
51 53
52   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} tb-core1
  54 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} tb-core1
53 55
54 56
... ...
... ... @@ -19,6 +19,8 @@ set -e
19 19
20 20 source compose-utils.sh
21 21
  22 +ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
  23 +
22 24 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
23 25
24   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS down -v
  26 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS down -v
... ...
... ... @@ -19,6 +19,8 @@ set -e
19 19
20 20 source compose-utils.sh
21 21
  22 +ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
  23 +
22 24 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
23 25
24   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS up -d
  26 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d
... ...
... ... @@ -19,6 +19,8 @@ set -e
19 19
20 20 source compose-utils.sh
21 21
  22 +ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
  23 +
22 24 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
23 25
24   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS stop
  26 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS stop
... ...
... ... @@ -19,7 +19,9 @@ set -e
19 19
20 20 source compose-utils.sh
21 21
  22 +ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
  23 +
22 24 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
23 25
24   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS pull $@
25   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS up -d --no-deps --build $@
  26 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS pull $@
  27 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d --no-deps --build $@
... ...
... ... @@ -40,12 +40,14 @@ set -e
40 40
41 41 source compose-utils.sh
42 42
  43 +ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
  44 +
43 45 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
44 46
45 47 ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
46 48
47   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS pull tb-core1
  49 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS pull tb-core1
48 50
49   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS up -d redis $ADDITIONAL_STARTUP_SERVICES
  51 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d redis $ADDITIONAL_STARTUP_SERVICES
50 52
51   -docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} tb-core1
  53 +docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} tb-core1
... ...
  1 +TB_QUEUE_TYPE=aws-sqs
  2 +TB_QUEUE_AWS_SQS_ACCESS_KEY_ID=YOUR_KEY
  3 +TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY=YOUR_SECRET
  4 +TB_QUEUE_AWS_SQS_REGION=YOUR_REGION
... ...
  1 +TB_QUEUE_TYPE=kafka
  2 +TB_KAFKA_SERVERS=kafka:9092
... ...
  1 +TB_QUEUE_TYPE=pubsub
  2 +TB_QUEUE_PUBSUB_PROJECT_ID=YOUR_PROJECT_ID
  3 +TB_QUEUE_PUBSUB_SERVICE_ACCOUNT=YOUR_SERVICE_ACCOUNT
\ No newline at end of file
... ...
  1 +TB_QUEUE_TYPE=rabbitmq
  2 +TB_QUEUE_RABBIT_MQ_HOST=localhost
  3 +TB_QUEUE_RABBIT_MQ_PORT=5672
  4 +TB_QUEUE_RABBIT_MQ_USERNAME=YOUR_USERNAME
  5 +TB_QUEUE_RABBIT_MQ_PASSWORD=YOUR_PASSWORD
\ No newline at end of file
... ...
  1 +TB_QUEUE_TYPE=service-bus
  2 +TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME=YOUR_NAMESPACE_NAME
  3 +TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME=YOUR_SAS_KEY_NAME
  4 +TB_QUEUE_SERVICE_BUS_SAS_KEY=YOUR_SAS_KEY
\ No newline at end of file
... ...
... ... @@ -4,6 +4,3 @@ ZOOKEEPER_URL=zookeeper:2181
4 4 COAP_BIND_ADDRESS=0.0.0.0
5 5 COAP_BIND_PORT=5683
6 6 COAP_TIMEOUT=10000
7   -
8   -TB_QUEUE_TYPE=kafka
9   -TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
... ...
... ... @@ -4,6 +4,3 @@ ZOOKEEPER_URL=zookeeper:2181
4 4 HTTP_BIND_ADDRESS=0.0.0.0
5 5 HTTP_BIND_PORT=8081
6 6 HTTP_REQUEST_TIMEOUT=60000
7   -
8   -TB_QUEUE_TYPE=kafka
9   -TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
... ...
1   -TB_QUEUE_TYPE=kafka
2 1 REMOTE_JS_EVAL_REQUEST_TOPIC=js_eval.requests
3   -TB_KAFKA_SERVERS=kafka:9092
4 2 LOGGER_LEVEL=info
5 3 LOG_FOLDER=logs
6 4 LOGGER_FILENAME=tb-js-executor-%DATE%.log
... ...
... ... @@ -4,6 +4,3 @@ ZOOKEEPER_URL=zookeeper:2181
4 4 MQTT_BIND_ADDRESS=0.0.0.0
5 5 MQTT_BIND_PORT=1883
6 6 MQTT_TIMEOUT=10000
7   -
8   -TB_QUEUE_TYPE=kafka
9   -TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
... ...
... ... @@ -2,8 +2,6 @@
2 2
3 3 ZOOKEEPER_ENABLED=true
4 4 ZOOKEEPER_URL=zookeeper:2181
5   -TB_QUEUE_TYPE=kafka
6   -TB_KAFKA_SERVERS=kafka:9092
7 5 JS_EVALUATOR=remote
8 6 TRANSPORT_TYPE=remote
9 7 CACHE_TYPE=redis
... ...