Merge pull request #264 from thingsboard/scripts

Deployment scripts refactoring

Author: dmytro-landiak

docker/README.md

@@ -65,7 +65,7 @@ In case you want to remove docker volumes for all the containers please execute
 
 It could be useful to update logs (enable DEBUG/TRACE logs) in runtime or change TBMQ or HAProxy configs. In order to do
 this you need to make changes, for example, to the
-[haproxy.cfg](/docker/haproxy/config/haproxy.cfg) or [logback.xml](/docker/tb-mqtt-broker/conf/logback.xml) file.
+[haproxy.cfg](/docker/haproxy/config/haproxy.cfg) or [logback.xml](/docker/tbmq/conf/logback.xml) file.
 Afterward, execute the next command to apply the changes for the container:
 
 ```

docker/docker-compose.yml

@@ -65,7 +65,7 @@ services:
       TB_SERVICE_ID: tbmq1
       #JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
-      - tb-mqtt-broker.env
+      - tbmq.env
     volumes:
       - tbmq-config:/config
       - tbmq1-logs:/var/log/thingsboard-mqtt-broker
@@ -90,7 +90,7 @@ services:
       TB_SERVICE_ID: tbmq2
       #JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
-      - tb-mqtt-broker.env
+      - tbmq.env
     volumes:
       - tbmq-config:/config
       - tbmq2-logs:/var/log/thingsboard-mqtt-broker

docker/haproxy/config/haproxy.cfg

@@ -95,7 +95,7 @@ frontend http-in
 
  use_backend letsencrypt_http if letsencrypt_http_acl
 
- default_backend tb-mqtt-broker-backend
+ default_backend tbmq-backend
 
 frontend https_in
   bind *:${HTTPS_PORT} ssl crt /usr/local/etc/haproxy/default.pem crt /usr/local/etc/haproxy/certs.d ciphers ECDHE-RSA-AES256-SHA:RC4-SHA:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM alpn h2,http/1.1
@@ -104,12 +104,12 @@ frontend https_in
 
   http-request add-header "X-Forwarded-Proto" "https"
 
-  default_backend tb-mqtt-broker-backend
+  default_backend tbmq-backend
 
 backend letsencrypt_http
   server letsencrypt_http_srv 127.0.0.1:8080
 
-backend tb-mqtt-broker-backend
+backend tbmq-backend
   balance leastconn
   option tcp-check
   option log-health-checks

docker/scripts/docker-refresh-config.sh

@@ -16,7 +16,7 @@
 
 set -e
 
-docker run --rm -v tbmq-config:/config -v ./tb-mqtt-broker/conf:/src-config busybox sh -c "cp /src-config/* /config"
+docker run --rm -v tbmq-config:/config -v ./tbmq/conf:/src-config busybox sh -c "cp /src-config/* /config"
 
 docker run --rm -v tbmq-haproxy-config:/config -v ./haproxy/config:/src-config busybox sh -c "cp /src-config/haproxy.cfg /config"
 

docker/scripts/docker-upgrade-tbmq.sh

@@ -39,7 +39,7 @@ COMPOSE_ARGS_UP="\
       up -d ${ADDITIONAL_STARTUP_SERVICES}"
 
 COMPOSE_ARGS_RUN="\
-      --env-file ./.env --env-file ./tb-mqtt-broker.env \
+      --env-file ./.env --env-file ./tbmq.env \
       -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} \
       run --no-deps --rm -e UPGRADE_TB=true \
       tbmq1"

docker/tb-mqtt-broker.env renamed to docker/tbmq.env

@@ -21,9 +21,9 @@ metadata:
   namespace: thingsboard-mqtt-broker
 spec:
   volumes:
-    - name: tb-broker-config
+    - name: tbmq-config
       configMap:
-        name: tb-broker-config
+        name: tbmq-config
         items:
           - key: conf
             path: thingsboard-mqtt-broker.conf
@@ -42,11 +42,11 @@ spec:
           value: "false"
       envFrom:
         - configMapRef:
-            name: tb-broker-db-config
+            name: tbmq-db-config
         - configMapRef:
-            name: tb-broker-cache-config
+            name: tbmq-cache-config
       volumeMounts:
         - mountPath: /config
-          name: tb-broker-config
+          name: tbmq-config
       command: [ 'sh', '-c', 'while [ ! -f /tmp/install-finished ]; do sleep 2; done;' ]
   restartPolicy: Never

docker/tb-mqtt-broker/conf/logback.xml renamed to docker/tbmq/conf/logback.xml

@@ -19,5 +19,5 @@ set -e
 
 kubectl config set-context $(kubectl config current-context) --namespace=thingsboard-mqtt-broker
 
-kubectl delete -f tb-broker.yml
+kubectl delete -f tbmq.yml
 kubectl delete -f tbmq-ie.yml