From d0079d6f565da1490b9aa2dd88299833d4b1bdc5 Mon Sep 17 00:00:00 2001
From: Oleg Sheynin <osheynin@gmail.com>
Date: Thu, 27 Mar 2025 17:50:05 -0400
Subject: [PATCH] progress

---
 VERSION                           |  2 +-
 microservices/md_gateway/build.sh | 64 +++-------------------------
 microservices/mu_svc_functions.sh | 71 +++++++++++++++++++++++++++++++
 microservices/requirements.txt    |  7 ---
 4 files changed, 79 insertions(+), 65 deletions(-)
 create mode 100755 microservices/mu_svc_functions.sh
 delete mode 100644 microservices/requirements.txt

diff --git a/VERSION b/VERSION
index 1c3cdd1..8e6b67e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.4.FX1,exch_acct_cfgname fixes
\ No newline at end of file
+0.2.5,microservices initial
\ No newline at end of file
diff --git a/microservices/md_gateway/build.sh b/microservices/md_gateway/build.sh
index 17bbf27..6c4ca24 100755
--- a/microservices/md_gateway/build.sh
+++ b/microservices/md_gateway/build.sh
@@ -17,45 +17,14 @@ ImageName=md_gateway
 RegistryService=cloud21.cvtt.vpn:5500
 # --- Settings
 
-get_cvttpy() {
-    Version=${1}
-    Project=cvttpy
-
-    host="cloud21.cvtt.vpn"
-    port="22"
-    user="cvttdist"
-    rel_dir="/home/cvttdist/software/cvtt2"
-    if [ "${Version}" == "latest" ]; then
-        echo "Checking for latest version of ${Project} on ${user}@${host}:${rel_dir}"
-        Version=$(ssh -q -p ${port} ${user}@${host} "ls -tr ${rel_dir}/${Project} | tail -1" )
-        echo "Latest version is ${Version}"
-    fi
-    echo "Checking ${user}@${host} for ${rel_dir}/${Project}/${Version} ..."
-    if ssh -q -p ${port} ${user}@${host} "test -d ${rel_dir}/${Project}/${Version}"
-    then
-        echo "Version ${Version} found..."
-        rsync_cmd="rsync -ahv -e \"ssh -p ${port}\""
-        rsync_cmd="${rsync_cmd} ${user}@${host}:${rel_dir}/${Project}/${Version}/"
-        rsync_cmd="${rsync_cmd} ./"
-        echo ${rsync_cmd}
-        eval ${rsync_cmd}
-        status=$?
-        if [ ${status} -eq 0 ]
-        then
-            echo "Loading successful..."
-            exit 1
-        fi
-    else
-        echo "Not Found ${rel_dir}/${Project}/${Version} on ${user}@${host}"
-    fi
-}
 
 DockerDir=$(realpath $(dirname ${0}))
 Version=${CvttpyVersion}
 
 cd ${DockerDir}
 
-get_cvttpy ${Version}
+source ../mu_svc_functions.sh
+get_project_version cvttpy ${Version}
 
 function cleanup {
     cd ${DockerDir}
@@ -63,29 +32,10 @@ function cleanup {
 }
 trap cleanup EXIT
 
-Cmd="docker build"
-Cmd+=" -t ${ImageName}"
-Cmd+=" -t ${ImageName}:latest"
-Cmd+=" -t ${ImageName}:${Version}"
-Cmd+=" -f Dockerfile"
-Cmd+=" ."
-echo ${Cmd}
-eval ${Cmd} || exit
-
-Cmd="docker tag ${ImageName}:latest ${RegistryService}/${ImageName}:latest"
-echo ${Cmd}
-eval ${Cmd} || exit
-
-Cmd="docker tag ${ImageName}:${Version} ${RegistryService}/${ImageName}:${Version}"
-echo ${Cmd}
-eval ${Cmd} || exit
-
-Cmd="docker push ${RegistryService}/${ImageName}:latest"
-echo ${Cmd}
-eval ${Cmd} || exit
-
-Cmd="docker push ${RegistryService}/${ImageName}:${Version}"
-echo ${Cmd}
-eval ${Cmd} || exit
+build_docker_image ${ImageName} ${RegistryService} ${Version}
+
+
+# echo "**** D E B U G  E X I T" && exit
+echo "***** ${0}  D O N E"
 
 
diff --git a/microservices/mu_svc_functions.sh b/microservices/mu_svc_functions.sh
new file mode 100755
index 0000000..6d78a0c
--- /dev/null
+++ b/microservices/mu_svc_functions.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+get_project_version() {
+    Project=${1}
+    Version=${2}
+
+    host="cloud21.cvtt.vpn"
+    port="22"
+    user="cvttdist"
+    rel_dir="/home/cvttdist/software/cvtt2"
+
+    if [ "${Version}" == "latest" ]; then
+        echo "Checking for latest version of ${Project} on ${user}@${host}:${rel_dir}"
+        Version=$(ssh -q -p ${port} ${user}@${host} "ls -tr ${rel_dir}/${Project} | tail -1" )
+        echo "Latest version is ${Version}"
+    fi
+    echo "Checking ${user}@${host} for ${rel_dir}/${Project}/${Version} ..."
+    if ssh -q -p ${port} ${user}@${host} "test -d ${rel_dir}/${Project}/${Version}"
+    then
+        echo "Version ${Version} found..."
+        rsync_cmd="rsync -ahv -e \"ssh -p ${port}\""
+        rsync_cmd="${rsync_cmd} ${user}@${host}:${rel_dir}/${Project}/${Version}/"
+        rsync_cmd="${rsync_cmd} ./"
+        echo ${rsync_cmd}
+        eval ${rsync_cmd}
+        status=$?
+        if [ ${status} -eq 0 ]
+        then
+            echo "Loading successful..."
+            return 0
+        else
+            return 1
+        fi
+    else
+        echo "Not Found ${rel_dir}/${Project}/${Version} on ${user}@${host}"
+        return 1
+    fi
+}
+
+build_docker_image() {
+    ImageName=${1}
+    RegistryService=${2}
+    Version=${3}
+
+    Cmd="docker build"
+    Cmd+=" -t ${ImageName}"
+    Cmd+=" -t ${ImageName}:latest"
+    Cmd+=" -t ${ImageName}:${Version}"
+    Cmd+=" -f Dockerfile"
+    Cmd+=" ."
+    echo ${Cmd}
+    eval ${Cmd} || exit
+
+    Cmd="docker tag ${ImageName}:latest ${RegistryService}/${ImageName}:latest"
+    echo ${Cmd}
+    eval ${Cmd} || exit
+
+    Cmd="docker tag ${ImageName}:${Version} ${RegistryService}/${ImageName}:${Version}"
+    echo ${Cmd}
+    eval ${Cmd} || exit
+
+    Cmd="docker push ${RegistryService}/${ImageName}:latest"
+    echo ${Cmd}
+    eval ${Cmd} || exit
+
+    Cmd="docker push ${RegistryService}/${ImageName}:${Version}"
+    echo ${Cmd}
+    eval ${Cmd} || exit
+}
+
+
diff --git a/microservices/requirements.txt b/microservices/requirements.txt
deleted file mode 100644
index 852e647..0000000
--- a/microservices/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-aiohttp>=3.7.4.post0
-nest-asyncio>=1.5.5
-hjson>=3.1.0
-sortedcontainers>=2.4.0
-redis>=5.0.8
-python-dateutil>=2.8.2
-types-python-dateutil>=2.8.19.6