docker build imagages script fix

This commit is contained in:
Oleg Sheynin 2025-01-27 18:15:30 -05:00
parent a35bcf089e
commit 07b933872d
3 changed files with 4 additions and 3 deletions

View File

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

View File

@ -232,6 +232,7 @@ get_latest_dist_version() {
echo "${Version}" echo "${Version}"
} }
echo "------------------------------------- Starting ${0} ${*}"
echo RootDir=${RootDir} echo RootDir=${RootDir}
cd ${RootDir} cd ${RootDir}
@ -256,7 +257,7 @@ for item in "${Jobs[@]}"; do
project=$(echo "$item" | jq -r '.value.based_on_project') project=$(echo "$item" | jq -r '.value.based_on_project')
test_script=$(echo "$item" | jq -r '.value.test_script') 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 done
Cmd="rm -rf ${RootDir}/docker_dev" Cmd="rm -rf ${RootDir}/docker_dev"

View File

@ -47,7 +47,7 @@ function rsync_load_version() {
if ssh -q -p ${port} ${user}@${host} "test -d ${rel_dir}/${Project}/${Version}" if ssh -q -p ${port} ${user}@${host} "test -d ${rel_dir}/${Project}/${Version}"
then then
echo "Directory found..." 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} ${user}@${host}:${rel_dir}/${Project}/${Version}"
rsync_cmd="${rsync_cmd} ${LocalSoftwareDir}/${Project}/" rsync_cmd="${rsync_cmd} ${LocalSoftwareDir}/${Project}/"
echo ${rsync_cmd} echo ${rsync_cmd}