Deploy Scripts:

- Updated tfs.sh to choose between classical docker build command or new docker buildx framework
- Minor cosmetic improvements

deploy/tfs.sh

@@ -183,24 +183,26 @@ REDIS_PASSWORD=`uuidgen`
 kubectl create secret generic redis-secrets --namespace=$TFS_K8S_NAMESPACE \
     --from-literal=REDIS_PASSWORD=$REDIS_PASSWORD
 echo "export REDIS_PASSWORD=${REDIS_PASSWORD}" >> $ENV_VARS_SCRIPT
+printf "\n"
 
 DOCKER_BUILD="docker build"
-DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "[ ][0-9]+[.]" | cut -c 1-3)
+DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "Docker version [0-9]+\." | grep -o -E "[0-9]+" | cut -c 1-3)
 if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then
-    DOCKER_BUILDX_VERSION=$(docker buildx version)
+    # If Docker version >= 23, build command was migrated to docker-buildx
+    # In Ubuntu, in practice, means to install package docker-buildx together with docker.io
+    # Check if docker-buildx plugin is installed
+    docker buildx version 1>/dev/null 2>/dev/null
     if [[ $? -ne 0 ]]; then
         echo "Docker buildx command is not installed. Check: https://docs.docker.com/build/architecture/#install-buildx"
-        exit 0;
+        echo "If you installed docker through APT package docker.io, consider installing also package docker-buildx"
+        exit 1;
     fi
     DOCKER_BUILD="docker buildx build"
 fi
-echo ${DOCKER_BUILD}
 
 for COMPONENT in $TFS_COMPONENTS; do
     echo "Processing '$COMPONENT' component..."
 
-    
-
     if [ "$TFS_SKIP_BUILD" != "YES" ]; then
         echo "  Building Docker image..."
         BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"