This commit is contained in:
Oleg Sheynin 2024-07-26 13:46:15 -04:00
parent b353572ea6
commit 9da9976698
3 changed files with 9 additions and 9 deletions

View File

@ -1 +1 @@
1.1.1 1.1.2

View File

@ -22,10 +22,14 @@ if [ -z ${date_to_load} ] ; then
echo "Yesterday data has priority. Running historical container will be stopped" echo "Yesterday data has priority. Running historical container will be stopped"
Cmd="docker stop ${ContainerName}" Cmd="docker stop ${ContainerName}"
echo ${Cmd} && eval ${Cmd} echo ${Cmd} && eval ${Cmd}
Cmd="docker kill ${ContainerName}"
echo ${Cmd} && eval ${Cmd}
Cmd="docker rm -f ${ContainerName}"
echo ${Cmd} && eval ${Cmd}
Cmd="docker ps" Cmd="docker ps"
echo ${Cmd} && eval ${Cmd} echo ${Cmd} && eval ${Cmd}
if is_container_running "$ContainerName"; then if is_container_running "$ContainerName"; then
echo "Container ${ContainerName} is still running." echo "Container ${ContainerName} is still running."
exit 3 exit 3

View File

@ -13,10 +13,9 @@ dist_host="cloud21.cvtt.vpn"
dist_ssh_port="22" dist_ssh_port="22"
dist_locations="cloud21.cvtt.vpn:22 homestore.cvtt.vpn:22" dist_locations="cloud21.cvtt.vpn:22 homestore.cvtt.vpn:22"
# ---------------- Settings
interactive=Y # ---------------- cmdline
# cmdline
prj= prj=
brnch=master brnch=master
interactive=N interactive=N
@ -26,7 +25,6 @@ usage() {
exit 1 exit 1
} }
while getopts ":p:b:i" opt; do while getopts ":p:b:i" opt; do
case ${opt} in case ${opt} in
p ) p )
@ -48,9 +46,7 @@ while getopts ":p:b:i" opt; do
;; ;;
esac esac
done done
# ---------------- cmdline
function confirm { function confirm {
if [ "${interactive}" == "Y" ]; then if [ "${interactive}" == "Y" ]; then