Merge branch 'develop/3.4' into refactoring_tests_08

docker/compose-utils.sh

@@ -121,3 +121,77 @@ function additionalStartupServices() {
 
     echo $ADDITIONAL_STARTUP_SERVICES
 }
+
+function permissionList() {
+    PERMISSION_LIST="
+      799  799  tb-node/log
+      799  799  tb-transports/coap/log
+      799  799  tb-transports/lwm2m/log
+      799  799  tb-transports/http/log
+      799  799  tb-transports/mqtt/log
+      799  799  tb-transports/snmp/log
+      799  799  tb-transports/coap/log
+      799  799  tb-vc-executor/log
+      999  999  tb-node/postgres
+      "
+
+    source .env
+
+    if [ "$DATABASE" = "hybrid" ]; then
+      PERMISSION_LIST="$PERMISSION_LIST
+      999  999  tb-node/cassandra
+      "
+    fi
+
+    CACHE="${CACHE:-redis}"
+    case $CACHE in
+        redis)
+          PERMISSION_LIST="$PERMISSION_LIST
+          1001 1001 tb-node/redis-data
+          "
+        ;;
+        redis-cluster)
+          PERMISSION_LIST="$PERMISSION_LIST
+          1001 1001 tb-node/redis-cluster-data-0
+          1001 1001 tb-node/redis-cluster-data-1
+          1001 1001 tb-node/redis-cluster-data-2
+          1001 1001 tb-node/redis-cluster-data-3
+          1001 1001 tb-node/redis-cluster-data-4
+          1001 1001 tb-node/redis-cluster-data-5
+          "
+        ;;
+        *)
+        echo "Unknown CACHE value specified in the .env file: '${CACHE}'. Should be either 'redis' or 'redis-cluster'." >&2
+        exit 1
+    esac
+
+    echo "$PERMISSION_LIST"
+}
+
+function checkFolders() {
+  EXIT_CODE=0
+  PERMISSION_LIST=$(permissionList) || exit $?
+  set -e
+  while read -r USR GRP DIR
+  do
+    if [ -z "$DIR" ]; then # skip empty lines
+          continue
+    fi
+    MESSAGE="Checking user ${USR} group ${GRP} dir ${DIR}"
+    if [[ -d "$DIR" ]] &&
+       [[ $(ls -ldn "$DIR" | awk '{print $3}') -eq "$USR" ]] &&
+       [[ $(ls -ldn "$DIR" | awk '{print $4}') -eq "$GRP" ]]
+    then
+      MESSAGE="$MESSAGE OK"
+    else
+      if [ "$1" = "--create" ]; then
+        echo "Create and chown: user ${USR} group ${GRP} dir ${DIR}"
+        mkdir -p "$DIR" && sudo chown -R "$USR":"$GRP" "$DIR"
+      else
+        echo "$MESSAGE FAILED"
+        EXIT_CODE=1
+      fi
+    fi
+  done < <(echo "$PERMISSION_LIST")
+  return $EXIT_CODE
+}

docker/docker-check-log-folders.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Copyright © 2016-2022 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+source compose-utils.sh
+checkFolders || exit $?
+echo "OK"

docker/docker-create-log-folders.sh

@@ -15,39 +15,6 @@
 # limitations under the License.
 #
 
-mkdir -p tb-node/log && sudo chown -R 799:799 tb-node/log
+set -e
-
+source compose-utils.sh
-mkdir -p tb-transports/coap/log && sudo chown -R 799:799 tb-transports/coap/log
+checkFolders --create
-
-mkdir -p tb-transports/lwm2m/log && sudo chown -R 799:799 tb-transports/lwm2m/log
-
-mkdir -p tb-transports/http/log && sudo chown -R 799:799 tb-transports/http/log
-
-mkdir -p tb-transports/mqtt/log && sudo chown -R 799:799 tb-transports/mqtt/log
-
-mkdir -p tb-transports/snmp/log && sudo chown -R 799:799 tb-transports/snmp/log
-
-mkdir -p tb-vc-executor/log && sudo chown -R 799:799 tb-vc-executor/log
-
-mkdir -p tb-node/postgres && sudo chown -R 999:999 tb-node/postgres
-
-mkdir -p tb-node/cassandra && sudo chown -R 999:999 tb-node/cassandra
-
-source .env
-CACHE="${CACHE:-redis}"
-case $CACHE in
-    redis)
-    mkdir -p tb-node/redis-data && sudo chown -R 1001:1001 tb-node/redis-data
-    ;;
-    redis-cluster)
-    mkdir -p tb-node/redis-cluster-data-0 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-0
-    mkdir -p tb-node/redis-cluster-data-1 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-1
-    mkdir -p tb-node/redis-cluster-data-2 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-2
-    mkdir -p tb-node/redis-cluster-data-3 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-3
-    mkdir -p tb-node/redis-cluster-data-4 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-4
-    mkdir -p tb-node/redis-cluster-data-5 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-5
-    ;;
-    *)
-    echo "Unknown CACHE value specified in the .env file: '${CACHE}'. Should be either 'redis' or 'redis-cluster'." >&2
-    exit 1
-esac

docker/docker-install-tb.sh

@@ -49,6 +49,8 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
 ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
 
+checkFolders --create || exit $?
+
 if [ ! -z "${ADDITIONAL_STARTUP_SERVICES// }" ]; then
     docker-compose \
       -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \

docker/docker-start-services.sh

@@ -27,6 +27,8 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
 ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?
 
+checkFolders --create || exit $?
+
 docker-compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
   up -d

docker/docker-upgrade-tb.sh

@@ -48,6 +48,8 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
 ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
 
+checkFolders --create || exit $?
+
 docker-compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
   pull \