ADM-21, DEV-107

microservices/.env

@@ -1,18 +1,25 @@
-CVTT_USER=1000:1000
-CVTT_VERSION=0.0.1
+CONFIG_SERVICE=cloud16.cvtt.vpn:6789
+CONFIG_COMM_SETTINGS=comm/pubsub/redis/docker_microservices
+CONFIG_FILE="http://${CONFIG_SERVICE}/apps/cvtt_musvc"
+
+CVTT_USER=1001:1001
+CVTT_VERSION=0.0.3
 
-# MDGW_CONFIG_FILE=config_musvc.cfg
 # MDGW_CREDS_FILE=.creds
-MDGW_LOG_FILE=%D.md_gateway.log
+MDGW_LOG_FILE=%T.md_gateway.log
 MDGW_ADD_ARGS=
 
-# OEGW_CONFIG_FILE=config_musvc.cfg
 # OEGW_CREDS_FILE=.creds
-OEGW_LOG_FILE=%D.oe_gateway.log
+OEGW_LOG_FILE=%T.oe_gateway.log
 #OEGW_ADD_ARGS="--log_level=DEBUG --debug_mode"
 OEGW_ADD_ARGS="--debug_mode"
 
-# ACGW_CONFIG_FILE=config_musvc.cfg
 # ACGW_CREDS_FILE=.creds
-ACGW_LOG_FILE=%D.ac_gateway.log
+ACGW_LOG_FILE=%T.ac_gateway.log
 ACGW_ADD_ARGS=
+
+PXER_LOG_FILE=%T.pricer.log
+PXER_ADD_ARGS=
+
+COORD_LOG_FILE=%T.coordinator.log
+COORD_ADD_ARGS=

microservices/ac_gateway/entrypoint.sh

@@ -1,14 +1,16 @@
 #!/bin/bash
 
-ConfigDir=/config
 LogDir=/logs
 
 Cmd="python3.12"
 Cmd+=" cvttpy/apps/microservices/market_gateways/accounting_gateway.py"
-Cmd+=" --config=${ConfigDir}/${ACGW_CONFIG_FILE:-cvtt_musvc.cfg}"
-Cmd+=" --credentials_file=${ConfigDir}/${ACGW_CREDS_FILE:-.creds}"
+
+Cmd+=" --config=${CONFIG_FILE:-/config/cvtt_musvc.cfg}"
+Cmd+=" --credentials_file=${ACGW_CREDS_FILE:-/config/.creds}"
+
 Cmd+=" --log_file=${LogDir}/${ACGW_LOG_FILE:-%T.ac_gateway.log}"
 Cmd+=" ${ACGW_ADD_ARGS}"
+
 echo ${Cmd}
 exec ${Cmd}
 

microservices/build.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
+# --- Settings
+RegistryService=cloud21.cvtt.vpn:5500
+ValidImages=(md_gateway oe_gateway ac_gateway pricer coordinator)
+# --- Settings
 
 usage() {
   echo "Usage: $0 -I <image_name> -V <image_version> -L <library>:<library_version>"
   exit 1
 }
 
-# --- Settings
-RegistryService=cloud21.cvtt.vpn:5500
-# --- Settings
-
 
 # ---------------- cmdline
 while getopts "I:V:L:" opt; do
@@ -54,24 +54,42 @@ if  [ "${Library}" != "" ] ; then
 fi
 # exit
 
-DockerDir=$(realpath $(dirname ${0})/${ImageName})
+build_musvc_image() {
+    ImageName=${1}
+    Project=${2}
+    ProjectVersion=${3}
 
-cd ${DockerDir}
-
-source ../mu_svc_functions.sh
-if [ "${Project}" != "" ]; then
-    get_project_version ${Project} ${ProjectVersion}
-fi
-
-
-function cleanup {
+    DockerDir=$(realpath $(dirname ${0})/${ImageName})
     cd ${DockerDir}
-    rm -rf cvttpy
+
+    if [ "${Project}" != "" ]; then
+        get_project_version ${Project} ${ProjectVersion}
+    fi
+
+    function cleanup {
+        cd ${DockerDir}
+        rm -rf cvttpy
+    }
+    trap cleanup RETURN
+
+    build_docker_image ${ImageName} ${RegistryService} ${ImageVersion} ${Project} ${ProjectVersion}
 }
-trap cleanup EXIT
 
-build_docker_image ${ImageName} ${RegistryService} ${ImageVersion}
 
+source $(realpath $(dirname ${0}))/mu_svc_functions.sh # ASSUMED same directory
+if [ "${ImageName}" == "__ALL__" ]; then
+    Images=(${ValidImages[@]})
+else
+    if [[ " ${ValidImages[*]} " == *" ${ImageName}"* ]]; then
+        Images=(${ImageName})
+    else
+        echo "ERROR: invalid image name \"${ImageName}\""
+        exit 1
+    fi
+fi
+for ImageName in "${Images[@]}"; do
+    build_musvc_image ${ImageName} ${Project} ${ProjectVersion}
+done
 
 # echo "**** D E B U G  E X I T" && exit
 echo "***** ${0}  D O N E"

microservices/coordinator/.dockerignore

@@ -0,0 +1,3 @@
+.git
+**/__pycache__
+.pipenv

microservices/coordinator/Dockerfile

@@ -0,0 +1,19 @@
+FROM python:3.12-slim
+
+COPY requirements.txt /
+
+RUN pip install --upgrade pip --root-user-action=ignore
+RUN pip install -r /requirements.txt --root-user-action=ignore
+
+COPY cvttpy /cvttpy
+
+RUN mkdir -p /logs /config
+
+SHELL ["/bin/bash", "-c"]
+
+ENV PYTHONPATH=/
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

microservices/coordinator/entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+LogDir=/logs
+
+Cmd="python3.12"
+Cmd+=" cvttpy/apps/microservices/coordinator/coordinator.py"
+
+Cmd+=" --config=${CONFIG_FILE:-/config/cvtt_musvc.cfg}"
+
+Cmd+=" --log_file=${LogDir}/${COORD_LOG_FILE:-%T.coordinator.log}"
+Cmd+=" ${COORD_ADD_ARGS}"
+echo ${Cmd}
+exec ${Cmd}
+

microservices/coordinator/requirements.txt

@@ -0,0 +1,9 @@
+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
+cryptography>=43.0.0
+PyJWT>=2.10.1

microservices/docker-compose.yml

@@ -1,13 +1,54 @@
 # CVTT Microservices
 services:
-    md_gateway:
-        image: cloud21.cvtt.vpn:5500/md_gateway:${CVTT_VERSION}
-        container_name: md_gateway
+    coordinator:
+        image: cloud21.cvtt.vpn:5500/coordinator:${CVTT_VERSION}
+        container_name: cvtt-coordinator
+        pull_policy: always
         user: ${CVTT_USER:-1001:1001}
         environment:
           CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
-          MDGW_CONFIG_FILE:  ${MDGW_CONFIG_FILE:-cvtt_musvc.cfg}
-          MDGW_CREDS_FILE:  ${MDGW_CONFIG_FILE:-.creds}
+          CONFIG_COMM_SETTINGS: ${CONFIG_COMM_SETTINGS:-comm/pubsub/redis/docker_microservices}
+          CONFIG_FILE:  ${CONFIG_FILE:-cvtt_musvc.cfg}
+          COORD_LOG_FILE:  ${COORD_LOG_FILE:-%T.coordinator.log}
+          COORD_ADD_ARGS: ${COORD_ADD_ARGS:-}
+        volumes:
+          - ./config:/config
+          - ./logs:/logs
+        depends_on:
+          - pricer
+          # - quant
+          # - trader
+          # - riskmgr
+          - redis
+
+    pricer:
+        image: cloud21.cvtt.vpn:5500/pricer:${CVTT_VERSION}
+        container_name: cvtt-pricer
+        pull_policy: always
+        user: ${CVTT_USER:-1001:1001}
+        environment:
+          CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
+          CONFIG_COMM_SETTINGS: ${CONFIG_COMM_SETTINGS:-comm/pubsub/redis/docker_microservices}
+          CONFIG_FILE:  ${CONFIG_FILE:-http://${CONFIG_SERVICE}/apps/cvtt_musvc}
+          COORD_LOG_FILE:  ${COORD_LOG_FILE:-%T.pricer.log}
+          COORD_ADD_ARGS: ${COORD_ADD_ARGS:-}
+        volumes:
+          - ./config:/config
+          - ./logs:/logs
+        depends_on:
+          - md_gateway
+          - redis
+
+    md_gateway:
+        image: cloud21.cvtt.vpn:5500/md_gateway:${CVTT_VERSION}
+        container_name: md_gateway
+        pull_policy: always
+        user: ${CVTT_USER:-1001:1001}
+        environment:
+          CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
+          CONFIG_COMM_SETTINGS: ${CONFIG_COMM_SETTINGS:-comm/pubsub/redis/docker_microservices}
+          CONFIG_FILE:  ${CONFIG_FILE:-http://${CONFIG_SERVICE}/apps/cvtt_musvc}
+          MDGW_CREDS_FILE:  ${MDGW_CREDS_FILE:-/config/.creds}
           MDGW_LOG_FILE:  ${MDGW_LOG_FILE:-%T.md_gateway.log}
           MDGW_ADD_ARGS: ${MDGW_ADD_ARGS:-}
         volumes:
@@ -19,11 +60,13 @@ services:
     oe_gateway:
         image: cloud21.cvtt.vpn:5500/oe_gateway:${CVTT_VERSION}
         container_name: oe_gateway
+        pull_policy: always
         user: ${CVTT_USER:-1001:1001}
         environment:
           CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
-          OEGW_CONFIG_FILE:  ${OEGW_CONFIG_FILE:-cvtt_musvc.cfg}
-          OEGW_CREDS_FILE:  ${OEGW_CONFIG_FILE:-.creds}
+          CONFIG_COMM_SETTINGS: ${CONFIG_COMM_SETTINGS:-comm/pubsub/redis/docker_microservices}
+          CONFIG_FILE:  ${CONFIG_FILE:-http://${CONFIG_SERVICE}/apps/cvtt_musvc}
+          OEGW_CREDS_FILE:  ${OEGW_CREDS_FILE:-/config/.creds}
           OEGW_LOG_FILE:  ${OEGW_LOG_FILE:-%T.oe_gateway.log}
           OEGW_ADD_ARGS: ${OEGW_ADD_ARGS:-}
         volumes:
@@ -35,11 +78,13 @@ services:
     ac_gateway:
         image: cloud21.cvtt.vpn:5500/ac_gateway:${CVTT_VERSION}
         container_name: ac_gateway
+        pull_policy: always
         user: ${CVTT_USER:-1001:1001}
         environment:
           CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
-          ACGW_CONFIG_FILE:  ${ACGW_CONFIG_FILE:-cvtt_musvc.cfg}
-          ACGW_CREDS_FILE:  ${ACGW_CONFIG_FILE:-.creds}
+          CONFIG_COMM_SETTINGS: ${CONFIG_COMM_SETTINGS:-comm/pubsub/redis/docker_microservices}
+          CONFIG_FILE:  ${CONFIG_FILE:-http://${CONFIG_SERVICE}/apps/cvtt_musvc}
+          ACGW_CREDS_FILE:  ${ACGW_CREDS_FILE:-/config/.creds}
           ACGW_LOG_FILE:  ${ACGW_LOG_FILE:-%T.ac_gateway.log}
           ACGW_ADD_ARGS: ${ACGW_ADD_ARGS:-}
         volumes:
@@ -55,4 +100,3 @@ services:
           - "16379:6379"
         volumes:
           - ./data/redis:/data
-

microservices/md_gateway/entrypoint.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-ConfigDir=/config
 LogDir=/logs
 
 Cmd="python3.12"
 Cmd+=" cvttpy/apps/microservices/market_gateways/md_gateway.py"
-Cmd+=" --config=${ConfigDir}/${MDGW_CONFIG_FILE:-cvtt_musvc.cfg}"
-Cmd+=" --credentials_file=${ConfigDir}/${MDGW_CREDS_FILE:-.creds}"
+
+Cmd+=" --config=${CONFIG_FILE:-/config/cvtt_musvc.cfg}"
+Cmd+=" --credentials_file=${MDGW_CREDS_FILE:-/config/.creds}"
+
 Cmd+=" --log_file=${LogDir}/${MDGW_LOG_FILE:-%T.md_gateway.log}"
 Cmd+=" ${MDGW_ADD_ARGS}"
 echo ${Cmd}

microservices/mu_svc_functions.sh

@@ -41,8 +41,13 @@ build_docker_image() {
     ImageName=${1}
     RegistryService=${2}
     Version=${3}
+    Project=${4}
+    ProjectVersion=${5}
 
     Cmd="docker build"
+    if [ "${ProjectVersion}" != "" ]; then
+        Cmd+=" --label ${Project}=\"${ProjectVersion}\""
+    fi
     Cmd+=" -t ${ImageName}"
     Cmd+=" -t ${ImageName}:latest"
     Cmd+=" -t ${ImageName}:${Version}"

microservices/oe_gateway/entrypoint.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-ConfigDir=/config
 LogDir=/logs
 
 Cmd="python3.12"
 Cmd+=" cvttpy/apps/microservices/market_gateways/order_entry_gateway.py"
-Cmd+=" --config=${ConfigDir}/${OEGW_CONFIG_FILE:-cvtt_musvc.cfg}"
-Cmd+=" --credentials_file=${ConfigDir}/${OEGW_CREDS_FILE:-.creds}"
+
+Cmd+=" --config=${CONFIG_FILE:-/config/cvtt_musvc.cfg}"
+Cmd+=" --credentials_file=${OEGW_CREDS_FILE:-/config/.creds}"
+
 Cmd+=" --log_file=${LogDir}/${OEGW_LOG_FILE:-%T.oe_gateway.log}"
 Cmd+=" ${OEGW_ADD_ARGS}"
 echo ${Cmd}

microservices/pricer/.dockerignore

@@ -0,0 +1,3 @@
+.git
+**/__pycache__
+.pipenv

microservices/pricer/Dockerfile

@@ -0,0 +1,19 @@
+FROM python:3.12-slim
+
+COPY requirements.txt /
+
+RUN pip install --upgrade pip --root-user-action=ignore
+RUN pip install -r /requirements.txt --root-user-action=ignore
+
+COPY cvttpy /cvttpy
+
+RUN mkdir -p /logs /config
+
+SHELL ["/bin/bash", "-c"]
+
+ENV PYTHONPATH=/
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

microservices/pricer/entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+LogDir=/logs
+
+Cmd="python3.12"
+Cmd+=" cvttpy/apps/microservices/pricer/pricer.py"
+
+Cmd+=" --config=${CONFIG_FILE:-/config/cvtt_musvc.cfg}"
+Cmd+=" --log_file=${LogDir}/${PXER_LOG_FILE:-%T.pricer.log}"
+
+Cmd+=" ${PXER_ADD_ARGS}"
+echo ${Cmd}
+exec ${Cmd}
+

microservices/pricer/requirements.txt

@@ -0,0 +1,9 @@
+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
+cryptography>=43.0.0
+PyJWT>=2.10.1