fix

VERSION

@@ -0,0 +1 @@
+1.9.9.F2,docker build imagages script fix

build/build_release.sh

@@ -14,9 +14,9 @@ dist_user=cvttdist
 dist_host="cloud21.cvtt.vpn"
 dist_ssh_port="22"
 
-dist_locations="cloud21.cvtt.vpn:22 hs01.cvtt.vpn:22"
 # ---------------- Settings
-
+dist_locations="cloud21.cvtt.vpn:22 hs01.cvtt.vpn:22"
+version_file="VERSION"
 # ---------------- cmdline
 prj=
 brnch=master
@@ -145,11 +145,12 @@ if [ "${?}" != "0" ]; then
 fi
 
 
-release_version=$(cat release_version.txt | awk -F',' '{print $1}')
-whats_new=$(cat release_version.txt | awk -F',' '{print $2}')
+release_version=$(cat ${version_file} | awk -F',' '{print $1}')
+whats_new=$(cat ${version_file} | awk -F',' '{print $2}')
 
 
 echo "--------------------------------"
+echo "Version file: ${version_file}"
 echo "Release version: ${release_version}"
 
 confirm
@@ -175,7 +176,7 @@ if [ "${project}" == "cvtt-rust" ]; then
     release_dir=${prj_dir}/dist/${project}
 
     cmd_arr+=("mkdir -p ${release_dir}")
-    cmd_arr+=("cp release_version.txt ${release_dir}")
+    cmd_arr+=("cp ${version_file} ${release_dir}")
 
     jq_cmd="jq '.packages[] | select(.targets[].kind[] == \"bin\") | .name'"
     apps=$(cargo metadata --no-deps --format-version 1 --manifest-path=${prj_dir}/Cargo.toml | eval $jq_cmd | uniq)

build/docker_images_builder.sh

@@ -5,6 +5,11 @@ usage() {
     echo
     exit 1
 }
+
+error_exit() {
+    echo "ERROR: ${1}"
+    exit 1
+}
 # --- Settings
 RootDir=${1}
 if [ -z "${RootDir}" ] ; then
@@ -37,6 +42,7 @@ build_docker_image() {
     image_name=${2}
     docker_dev_path=${3}
     project=${4}
+    test_script=${5}
 
     echo "Building ${title}..."
     echo "ImageName=${image_name}"
@@ -76,29 +82,93 @@ build_docker_image() {
     Cmd+=" -t ${image_name}:${image_version}"
     Cmd+=" -f ${DockerDir}/Dockerfile ${RootDir}"
     echo ${Cmd}
-    eval ${Cmd} 1>&2 || exit
+    eval ${Cmd} 1>&2 || error_exit "Docker build failed"
+
+    if [ ! -z "${test_script}" ] && [ "${test_script}" != "null" ]; then
+        if [ ! -f ${DockerDir}/${test_script} ]; then
+            error_exit "Test script ${test_script} is missing"
+        fi
+        echo "Running test script ${test_script} for ${image_name}"
+
+        Cmd="docker cp ${DockerDir}/${test_script} ${image_name}:/"
+        echo ${Cmd}
+        eval ${Cmd} 1>&2 || error_exit "Test script copy failed"
+
+        Cmd="docker exec ${image_name} chmod +x /${test_script}"
+        echo ${Cmd}
+        eval ${Cmd} 1>&2 || error_exit "Test script chmod failed"
+
+        Cmd="docker run"
+        Cmd+=" --rm"
+        Cmd+=" -d"
+        Cmd+=" --name test-container"
+        Cmd+=" ${image_name}"
+        Cmd+=" /bin/bash -c /${TestScript}"
+
+        echo ${Cmd}
+        eval ${Cmd} 1>&2 || error_exit "Test script run failed"
+
+        echo "Removing test script ${test_script} from ${image_name}"
+        Cmd="docker exec ${image_name} rm /${test_script}"
+        echo ${Cmd}
+        eval ${Cmd} 1>&2 || error_exit "Test script remove failed"
+    fi
+
+
+: <<'COMMENT'
+    -------------------------
+    Every single docker_dev project must have a test script
+    image_test.sh
+    that is copied to the image's root directory.
+    -------------------------
+
+
+    Cmd="docker run"
+    Cmd+=" --rm"
+    Cmd+=" -d"
+    Cmd+=" --name test-container"
+    Cmd+=" ${image_name}"
+    Cmd+=" /bin/bash -c /${TestScript}"
+
+    echo ${Cmd}
+    eval ${Cmd} 1>&2 || exit 1
+
+
+    # Get the exit status of the test script
+    docker wait test-container
+
+    # Check the exit status of the container
+    EXIT_STATUS=$?
+
+    # Analyze the exit status
+    if [ ${EXIT_STATUS} -ne 0 ]; then
+        echo "Tests Failed"
+        exit 1
+    fi
+COMMENT
+
 
     Cmd="docker tag"
     Cmd+=" ${image_name}:latest"
     Cmd+=" ${RegistryService}/${image_name}:latest"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker tag failed"
 
     Cmd="docker tag"
     Cmd+=" ${image_name}:${image_version}"
     Cmd+=" ${RegistryService}/${image_name}:${image_version}"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker tag  2failed"
 
     Cmd="docker push"
     Cmd+=" ${RegistryService}/${image_name}:latest"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker push failed"
 
     Cmd="docker push"
     Cmd+=" ${RegistryService}/${image_name}:${image_version}"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker push 2 failed"
 
     echo "Removing the copy of ${project} from ${RootDir}"
     Cmd="rm -rf ${RootDir}/${project}"
@@ -166,6 +236,7 @@ get_latest_dist_version() {
     echo "${Version}"
 }
 
+echo "------------------------------------- Starting ${0} ${*}"
 echo RootDir=${RootDir}
 
 cd ${RootDir}
@@ -188,8 +259,9 @@ for item in "${Jobs[@]}"; do
     image_name=$(echo "$item" | jq -r '.value.image_name')
     docker_dev_path=$(echo "$item" | jq -r '.value.docker_dev_path')
     project=$(echo "$item" | jq -r '.value.based_on_project')
+    test_script=$(echo "$item" | jq -r '.value.test_script')
 
-    build_docker_image "$title" "$image_name" "$docker_dev_path" "$project"
+    build_docker_image "$title" "$image_name" "$docker_dev_path" "$project" "${test_script}"
 done
 
 Cmd="rm -rf ${RootDir}/docker_dev"

docker/market_data/hist/crypto_md_day.sh

@@ -11,16 +11,17 @@ if [ -z ${date} ] ; then
 fi
 
 Cmd="docker run"
-Cmd="${Cmd} --pull=always"
-Cmd="${Cmd} --network=host"
-Cmd="${Cmd} --name=crypto_md_day.${host}.${date}"
-Cmd="${Cmd} --rm"
-Cmd="${Cmd} --volume=${HOME}/.creds:/.creds"
-Cmd="${Cmd} ${DockerImage}"
-Cmd="${Cmd} -h ${host}"
-Cmd="${Cmd} -d ${date}"
-# Cmd="${Cmd} -s coinbase,bnbspot,bnbfut"
-Cmd="${Cmd} -s coinbase,bnbspot"
+Cmd+=" --pull=always"
+Cmd+=" --network=host"
+Cmd+=" --name=crypto_md_day.${host}.${date}"
+Cmd+=" --rm"
+Cmd+=" --volume=${HOME}/.creds:/.creds"
+Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" ${DockerImage}"
+Cmd+=" -h ${host}"
+Cmd+=" -d ${date}"
+# Cmd+=" -s coinbase,bnbspot,bnbfut"
+Cmd+=" -s coinbase,bnbspot"
 
 echo $Cmd
 eval $Cmd

docker/market_data/hist/load_alpaca_hbar.sh

@@ -86,16 +86,17 @@ fi
 echo "date_to_load=${date_to_load}"
 
 Cmd="docker run"
-Cmd="${Cmd} --pull=always"
-Cmd="${Cmd} --network=host"
-Cmd="${Cmd} --name=${ContainerName}"
-Cmd="${Cmd} --rm"
-Cmd="${Cmd} --volume=${LogDir}:/logs"
-Cmd="${Cmd} --volume=${HOME}/.creds:/.creds"
-Cmd="${Cmd} ${DockerImage}"
-Cmd="${Cmd} -d ${date_to_load}"
+Cmd+=" --pull=always"
+Cmd+=" --network=host"
+Cmd+=" --name=${ContainerName}"
+Cmd+=" --rm"
+Cmd+=" --volume=${LogDir}:/logs"
+Cmd+=" --volume=${HOME}/.creds:/.creds"
+Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" ${DockerImage}"
+Cmd+=" -d ${date_to_load}"
 if [ -n "${NumSymbols}" ]; then
-    Cmd="${Cmd} -N ${NumSymbols}"
+    Cmd+=" -N ${NumSymbols}"
 fi
 
 echo $Cmd

docker/market_data/hist/load_alpaca_qat.sh

@@ -91,15 +91,16 @@ fi
 echo "date_to_load=${date_to_load}"
 
 Cmd="docker run"
-Cmd="${Cmd} --pull=always"
-Cmd="${Cmd} --network=host"
-Cmd="${Cmd} --name=${ContainerName}"
-Cmd="${Cmd} --rm"
-Cmd="${Cmd} --volume=${LogDir}:/logs"
-Cmd="${Cmd} --volume=${HOME}/.creds:/.creds"
-Cmd="${Cmd} ${DockerImage}"
-Cmd="${Cmd} -d ${date_to_load}"
-Cmd="${Cmd} -S ${Symbols}"
+Cmd+=" --pull=always"
+Cmd+=" --network=host"
+Cmd+=" --name=${ContainerName}"
+Cmd+=" --rm"
+Cmd+=" --volume=${LogDir}:/logs"
+Cmd+=" --volume=${HOME}/.creds:/.creds"
+Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" ${DockerImage}"
+Cmd+=" -d ${date_to_load}"
+Cmd+=" -S ${Symbols}"
 
 echo $Cmd
 eval $Cmd

docker/market_data/recorder/md_recorder.sh

@@ -44,16 +44,17 @@ fi
 
 
 Cmd="docker run"
-Cmd="${Cmd} -d"
-Cmd="${Cmd} --rm"
-Cmd="${Cmd} --network=host"
-Cmd="${Cmd} --pull=always"
-Cmd="${Cmd} --name=${ContainerName}"
-Cmd="${Cmd} -v /home/cvtt/.creds:/.creds"
-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} ${job}"
+Cmd+=" -d"
+Cmd+=" --rm"
+Cmd+=" --network=host"
+Cmd+=" --pull=always"
+Cmd+=" --name=${ContainerName}"
+Cmd+=" -v /home/cvtt/.creds:/.creds"
+Cmd+=" -v /home/cvtt/prod/data:/app/data"
+Cmd+=" -v /home/cvtt/prod/logs:/logs"
+Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" cloud21.cvtt.vpn:5500/md_recorder:latest"
+Cmd+=" ${job}"
 
 echo ${Cmd}
 eval ${Cmd}

docker/market_data/recorder/md_recorder_monitor.sh

@@ -45,15 +45,16 @@ if is_container_running "$ContainerName"; then
 fi
 
 Cmd="docker run"
-Cmd="${Cmd} -d"
-Cmd="${Cmd} --rm"
-Cmd="${Cmd} --network=host"
-Cmd="${Cmd} --pull=always"
-Cmd="${Cmd} --name=${ContainerName}"
-Cmd="${Cmd} -v /home/cvtt/.creds:/.creds"
-Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs"
-Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder_monitor:latest"
-Cmd="${Cmd} ${Instance} ${AdminPort}"
+Cmd+=" -d"
+Cmd+=" --rm"
+Cmd+=" --network=host"
+Cmd+=" --pull=always"
+Cmd+=" --name=${ContainerName}"
+Cmd+=" -v /home/cvtt/.creds:/.creds"
+Cmd+=" -v /home/cvtt/prod/logs:/logs"
+Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" cloud21.cvtt.vpn:5500/md_recorder_monitor:latest"
+Cmd+=" ${Instance} ${AdminPort}"
 
 echo ${Cmd}
 eval ${Cmd}

docker/research/crypto_exch_stats.sh

@@ -8,6 +8,7 @@ Cmd+=" --network=host"
 Cmd+=" --name=crypto_exch_stats"
 Cmd+=" --volume=${HOME}/prod/data:/app/data"
 Cmd+=" --volume=${HOME}/prod/logs:/logs"
+Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
 Cmd+=" cloud21.cvtt.vpn:5500/crypto_exch_stats:latest"
 
 echo ${Cmd}

release_version.txt

@@ -1 +0,0 @@
-1.9.6,storage healthcheck - ignore known_hosts

scripts/set_version.sh

@@ -47,7 +47,7 @@ function rsync_load_version() {
         if ssh -q -p ${port} ${user}@${host} "test -d ${rel_dir}/${Project}/${Version}"
         then
             echo "Directory found..."
-            rsync_cmd="rsync -ahvv -e \"ssh -p ${port}\""
+            rsync_cmd="rsync -ahv -e \"ssh -p ${port}\""
             rsync_cmd="${rsync_cmd} ${user}@${host}:${rel_dir}/${Project}/${Version}"
             rsync_cmd="${rsync_cmd} ${LocalSoftwareDir}/${Project}/"
             echo ${rsync_cmd}

utils/Makefile

@@ -6,7 +6,7 @@ SUBDIRS += configs
 
 
 FILES=
-FILES += release_version.txt
+FILES += VERSION
 
 all: install