diff --git a/docker/md_recorder.sh b/docker/md_recorder.sh index 4b8b48b..b749f2d 100755 --- a/docker/md_recorder.sh +++ b/docker/md_recorder.sh @@ -37,10 +37,11 @@ fi ContainerName="md_recorder.${job}" - if is_container_running "$ContainerName"; then - echo "Container ${ContainerName} is running." - exit - fi +if is_container_running "$ContainerName"; then + echo "Container ${ContainerName} is already running. Aborted." + exit +fi + Cmd="docker run" Cmd="${Cmd} -d" diff --git a/docker/md_recorder_monitor.sh b/docker/md_recorder_monitor.sh index 959ecac..2b5b921 100755 --- a/docker/md_recorder_monitor.sh +++ b/docker/md_recorder_monitor.sh @@ -17,6 +17,18 @@ is_valid() { return 1 } +is_container_running() { + local container_name=$1 + + if [ "$(docker ps --filter "name=^/${container_name}$" --filter "status=running" -q)" ]; then + return 0 # true + else + return 1 # false + fi +} + + + Instance=${1} if ! is_valid "${Instance}"; then @@ -28,13 +40,19 @@ if [ "${2}" != "" ]; then AdminPort=${2} fi +ContainerName="md_recorder_monitor.${Instance}" + +if is_container_running "$ContainerName"; then + echo "Container ${ContainerName} is already running. Aborted." + exit +fi Cmd="docker run" Cmd="${Cmd} -d" Cmd="${Cmd} --rm" Cmd="${Cmd} --network=host" Cmd="${Cmd} --pull=always" -Cmd="${Cmd} --name=md_recorder_monitor.${Instance}" +Cmd="${Cmd} --name=${ContainerName}" Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs" Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder_monitor:latest" Cmd="${Cmd} ${Instance} ${AdminPort}" diff --git a/release_version.txt b/release_version.txt index e8ea05d..c813fe1 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.2.4 +1.2.5