From f639bd41f5cd7fb0aee74de3a00045b52133661f Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Mon, 27 Jan 2025 18:15:30 -0500 Subject: [PATCH] docker build imagages script fix --- VERSION | 2 +- build/docker_images_builder.sh | 3 ++- scripts/set_version.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index c56a61d..fffb379 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9.8,release_version.txt -> VERSION +1.9.9,docker build imagages script fix diff --git a/build/docker_images_builder.sh b/build/docker_images_builder.sh index 2cb78d8..5980c6a 100755 --- a/build/docker_images_builder.sh +++ b/build/docker_images_builder.sh @@ -232,6 +232,7 @@ get_latest_dist_version() { echo "${Version}" } +echo "------------------------------------- Starting ${0} ${*}" echo RootDir=${RootDir} cd ${RootDir} @@ -256,7 +257,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" diff --git a/scripts/set_version.sh b/scripts/set_version.sh index 26bd52b..8dc9370 100755 --- a/scripts/set_version.sh +++ b/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}