diff --git a/release_version.txt b/release_version.txt index 524cb55..45a1b3f 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.1.1 +1.1.2 diff --git a/scripts/alpaca_hist_md/alpaca_md_day.sh b/scripts/alpaca_hist_md/alpaca_md_day.sh index cef1765..3d3b7c7 100755 --- a/scripts/alpaca_hist_md/alpaca_md_day.sh +++ b/scripts/alpaca_hist_md/alpaca_md_day.sh @@ -22,10 +22,14 @@ if [ -z ${date_to_load} ] ; then echo "Yesterday data has priority. Running historical container will be stopped" Cmd="docker stop ${ContainerName}" echo ${Cmd} && eval ${Cmd} + Cmd="docker kill ${ContainerName}" + echo ${Cmd} && eval ${Cmd} + Cmd="docker rm -f ${ContainerName}" + echo ${Cmd} && eval ${Cmd} Cmd="docker ps" echo ${Cmd} && eval ${Cmd} - + if is_container_running "$ContainerName"; then echo "Container ${ContainerName} is still running." exit 3 diff --git a/scripts/build_release.sh b/scripts/build_release.sh index 4c04b4b..9566b15 100755 --- a/scripts/build_release.sh +++ b/scripts/build_release.sh @@ -13,10 +13,9 @@ dist_host="cloud21.cvtt.vpn" dist_ssh_port="22" dist_locations="cloud21.cvtt.vpn:22 homestore.cvtt.vpn:22" +# ---------------- Settings -interactive=Y - -# cmdline +# ---------------- cmdline prj= brnch=master interactive=N @@ -26,7 +25,6 @@ usage() { exit 1 } - while getopts ":p:b:i" opt; do case ${opt} in p ) @@ -48,9 +46,7 @@ while getopts ":p:b:i" opt; do ;; esac done - - - +# ---------------- cmdline function confirm { if [ "${interactive}" == "Y" ]; then