Compare commits

..

No commits in common. "f639bd41f5cd7fb0aee74de3a00045b52133661f" and "5bf02ae67af6ca83dab75a111406df8c508b94b4" have entirely different histories.

4 changed files with 3 additions and 5 deletions

View File

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

View File

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

View File

@ -232,7 +232,6 @@ get_latest_dist_version() {
echo "${Version}" echo "${Version}"
} }
echo "------------------------------------- Starting ${0} ${*}"
echo RootDir=${RootDir} echo RootDir=${RootDir}
cd ${RootDir} cd ${RootDir}
@ -257,7 +256,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 -ahv -e \"ssh -p ${port}\"" rsync_cmd="rsync -ahvv -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}