From 2938a40c48c63430f5ca26a73fd30b3a071f96fc Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Sun, 7 May 2017 10:58:01 +0300 Subject: [PATCH] Docker improve for avoiding unnecessary demo and system data run --- docker/.env | 5 +++++ docker/docker-compose.yml | 6 ++++-- docker/thingsboard-db-schema.env | 5 ----- 3 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 docker/thingsboard-db-schema.env diff --git a/docker/.env b/docker/.env index ca7f2b0357..f7cecd9ab6 100644 --- a/docker/.env +++ b/docker/.env @@ -1 +1,6 @@ CASSANDRA_DATA_DIR=/home/docker/cassandra_volume + +# cassandra schema container environment variables +SKIP_SCHEMA_CREATION=false +SKIP_SYSTEM_DATA=true +SKIP_DEMO_DATA=true \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d19332b8de..c79625ae3c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -28,8 +28,10 @@ services: entrypoint: ./run_thingsboard.sh thingsboard-db-schema: image: "thingsboard/thingsboard-db-schema:1.2.2" - env_file: - - thingsboard-db-schema.env + environment: + - SKIP_SCHEMA_CREATION=${SKIP_SCHEMA_CREATION} + - SKIP_SYSTEM_DATA=${SKIP_SYSTEM_DATA} + - SKIP_DEMO_DATA=${SKIP_DEMO_DATA} entrypoint: ./install_schema.sh db: image: "cassandra:3.9" diff --git a/docker/thingsboard-db-schema.env b/docker/thingsboard-db-schema.env deleted file mode 100644 index c8d2bd83d8..0000000000 --- a/docker/thingsboard-db-schema.env +++ /dev/null @@ -1,5 +0,0 @@ -#Db schema configuration - -SKIP_SCHEMA_CREATION=false -SKIP_SYSTEM_DATA=false -SKIP_DEMO_DATA=false \ No newline at end of file