From 362a2bf61d5d54316af9b76f4fc5c8301efa0483 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Mon, 29 Jul 2024 20:28:30 -0400 Subject: [PATCH] progress --- docker/md_recorder.sh | 21 +++++++++++++---- docker/md_recorder_monitor.sh | 44 +++++++++++++++++++++++++++++++++++ release_version.txt | 2 +- 3 files changed, 62 insertions(+), 5 deletions(-) create mode 100755 docker/md_recorder_monitor.sh diff --git a/docker/md_recorder.sh b/docker/md_recorder.sh index f551b81..b0a5037 100755 --- a/docker/md_recorder.sh +++ b/docker/md_recorder.sh @@ -1,14 +1,27 @@ #!/bin/bash +ValidJobs=('BNBFUT_CLD21' 'BNBSPOT_CLD21' 'COINBASE_CLD21' 'BNBFUT_CVTTDATA' 'BNBSPOT_CVTTDATA' 'COINBASE_CVTTDATA') # runs on host to start container usage() { - echo "Usage: $0 (BNBFUT_CLD21, BNBSPOT_CLD21, BNBSPOT_CVTTDATA, COINBASE_CLD21)" + echo "Usage: $0 " exit 1 } +is_valid() { + local job=$1 + for valid_job in "${ValidJobs[@]}"; + do + echo "job=$job valid_job=$valid_job" + if [[ "${job}" == "${valid_job}" ]]; then + return 0 + fi + done + return 1 +} + job=${1} -if [ "${job}" == "" ] ; then +if ! is_valid "${job}"; then usage fi @@ -21,7 +34,7 @@ Cmd="${Cmd} --name=md_recorder.${job}" Cmd="${Cmd} -v /home/cvtt/prod/data:/app/data" Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs" Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder:latest" -Cmd="${Cmd} ${1}" +Cmd="${Cmd} ${job}" echo ${Cmd} -eval ${Cmd} +# eval ${Cmd} diff --git a/docker/md_recorder_monitor.sh b/docker/md_recorder_monitor.sh new file mode 100755 index 0000000..2ff8e73 --- /dev/null +++ b/docker/md_recorder_monitor.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +usage() { + echo "Usage: $0 []" + exit 1 +} + +ValidInstances=('CLD21' 'CVTTDATA') +is_valid() { + local inst=$1 + for valid_inst in "${ValidInstances[@]}"; + do + if [[ "$inst" == "$valid_inst" ]]; then + return 0 + fi + done + return 1 +} + + +Instance=${1} +if ! is_valid "${Instance}"; then + usage +fi + +AdminPort=7225 +if [ "${2}" != "" ]; then + AdminPort=${2} +fi + + +Cmd="docker run" +Cmd="${Cmd} -d" +Cmd="${Cmd} --rm" +Cmd="${Cmd} --network=host" +Cmd="${Cmd} --pull=always" +Cmd="${Cmd} --name=md_recorder_monitor.${job}" +Cmd="${Cmd} -p ${AdminPort}:${AdminPort}" +Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs" +Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder:latest" +Cmd="${Cmd} ${Instance} ${AdminPort}" + +echo ${Cmd} +eval ${Cmd} diff --git a/release_version.txt b/release_version.txt index 18efdb9..512a1fa 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.1.8 +1.1.9