From 124ef54a78a2d88a33c34c7cbad5c97896f85f9b Mon Sep 17 00:00:00 2001 From: Jeroen Laverman Date: Fri, 5 Oct 2018 11:12:57 +0200 Subject: [PATCH] Remove unnecessary properties Signed-off-by: Jeroen Laverman jeroen.laverman@bosch-si.com --- hawkbit-runtime/docker/docker-compose-stack.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hawkbit-runtime/docker/docker-compose-stack.yml b/hawkbit-runtime/docker/docker-compose-stack.yml index 1a3127d0d..30a61ffb8 100644 --- a/hawkbit-runtime/docker/docker-compose-stack.yml +++ b/hawkbit-runtime/docker/docker-compose-stack.yml @@ -23,12 +23,11 @@ services: restart_policy: condition: on-failure environment: - - 'SPRING_PROFILES_ACTIVE=cloudsandbox' - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/hawkbit' + - 'SPRING_DATASOURCE_USERNAME=root' - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - - 'SPRING_DATASOURCE_USERNAME=root' # --------------------- # hawkBit simulator @@ -43,16 +42,12 @@ services: restart_policy: condition: on-failure environment: + - 'HAWKBIT_DEVICE_SIMULATOR_AUTOSTARTS_[0]_TENANT=DEFAULT' - 'SPRING_RABBITMQ_VIRTUALHOST=/' - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_PORT=5672' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - - 'SPRING_RABBITMQ_SSL_ENABLED=false' - - 'HAWKBIT_DEVICES_SIMULATOR_AMQP_RECEIVERCONNECTORQUEUEFROMSP=sp_direct_queue' - - 'HAWKBIT_DEVICES_SIMULATOR_AMQP_SENDERFORSPEXCHANGE=sp.direct.exchange' - - 'HAWKBIT_DEVICES_SIMULATOR_AMQP_DEADLETTERQUEUE=sp_direct_queue_deadletter_ttl' - - 'HAWKBIT_DEVICES_SIMULATOR_AMQP_DEADLETTEREXCHANGE=sp.direct.exchange.deadletter' # --------------------- # RabbitMQ service