fix

VERSION

@@ -1 +1 @@
-1.9.8,release_version.txt -> VERSION
+1.9.9.F2,docker build imagages script fix

build/build_release.sh

@@ -150,6 +150,7 @@ whats_new=$(cat ${version_file} | awk -F',' '{print $2}')
 
 
 echo "--------------------------------"
+echo "Version file: ${version_file}"
 echo "Release version: ${release_version}"
 
 confirm

build/docker_images_builder.sh

@@ -5,6 +5,11 @@ usage() {
     echo
     exit 1
 }
+
+error_exit() {
+    echo "ERROR: ${1}"
+    exit 1
+}
 # --- Settings
 RootDir=${1}
 if [ -z "${RootDir}" ] ; then
@@ -77,22 +82,21 @@ build_docker_image() {
     Cmd+=" -t ${image_name}:${image_version}"
     Cmd+=" -f ${DockerDir}/Dockerfile ${RootDir}"
     echo ${Cmd}
-    eval ${Cmd} 1>&2 || exit 1
+    eval ${Cmd} 1>&2 || error_exit "Docker build failed"
 
-    if [ ! -z "${test_script}" ]; then
+    if [ ! -z "${test_script}" ] && [ "${test_script}" != "null" ]; then
         if [ ! -f ${DockerDir}/${test_script} ]; then
-            echo "Test script ${test_script} is missing"
-            exit 1
+            error_exit "Test script ${test_script} is missing"
         fi
         echo "Running test script ${test_script} for ${image_name}"
 
         Cmd="docker cp ${DockerDir}/${test_script} ${image_name}:/"
         echo ${Cmd}
-        eval ${Cmd} 1>&2 || exit 1
+        eval ${Cmd} 1>&2 || error_exit "Test script copy failed"
 
         Cmd="docker exec ${image_name} chmod +x /${test_script}"
         echo ${Cmd}
-        eval ${Cmd} 1>&2 || exit 1
+        eval ${Cmd} 1>&2 || error_exit "Test script chmod failed"
 
         Cmd="docker run"
         Cmd+=" --rm"
@@ -102,12 +106,12 @@ build_docker_image() {
         Cmd+=" /bin/bash -c /${TestScript}"
 
         echo ${Cmd}
-        eval ${Cmd} 1>&2 || exit 1
+        eval ${Cmd} 1>&2 || error_exit "Test script run failed"
 
         echo "Removing test script ${test_script} from ${image_name}"
         Cmd="docker exec ${image_name} rm /${test_script}"
         echo ${Cmd}
-        eval ${Cmd} 1>&2 || exit 1
+        eval ${Cmd} 1>&2 || error_exit "Test script remove failed"
     fi
 
 
@@ -148,23 +152,23 @@ COMMENT
     Cmd+=" ${image_name}:latest"
     Cmd+=" ${RegistryService}/${image_name}:latest"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker tag failed"
 
     Cmd="docker tag"
     Cmd+=" ${image_name}:${image_version}"
     Cmd+=" ${RegistryService}/${image_name}:${image_version}"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker tag  2failed"
 
     Cmd="docker push"
     Cmd+=" ${RegistryService}/${image_name}:latest"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker push failed"
 
     Cmd="docker push"
     Cmd+=" ${RegistryService}/${image_name}:${image_version}"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker push 2 failed"
 
     echo "Removing the copy of ${project} from ${RootDir}"
     Cmd="rm -rf ${RootDir}/${project}"
@@ -232,6 +236,7 @@ get_latest_dist_version() {
     echo "${Version}"
 }
 
+echo "------------------------------------- Starting ${0} ${*}"
 echo RootDir=${RootDir}
 
 cd ${RootDir}
@@ -256,7 +261,7 @@ for item in "${Jobs[@]}"; do
     project=$(echo "$item" | jq -r '.value.based_on_project')
     test_script=$(echo "$item" | jq -r '.value.test_script')
 
-    build_docker_image "$title" "$image_name" "$docker_dev_path" "$project" "${test_script}
+    build_docker_image "$title" "$image_name" "$docker_dev_path" "$project" "${test_script}"
 done
 
 Cmd="rm -rf ${RootDir}/docker_dev"

scripts/set_version.sh

@@ -47,7 +47,7 @@ function rsync_load_version() {
         if ssh -q -p ${port} ${user}@${host} "test -d ${rel_dir}/${Project}/${Version}"
         then
             echo "Directory found..."
-            rsync_cmd="rsync -ahvv -e \"ssh -p ${port}\""
+            rsync_cmd="rsync -ahv -e \"ssh -p ${port}\""
             rsync_cmd="${rsync_cmd} ${user}@${host}:${rel_dir}/${Project}/${Version}"
             rsync_cmd="${rsync_cmd} ${LocalSoftwareDir}/${Project}/"
             echo ${rsync_cmd}