From 930981b260a6367bbc4a1945949c1aeae07f74d3 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Thu, 27 Mar 2025 17:20:52 -0400 Subject: [PATCH 1/7] new microservices images --- microservices/docker-compose.yml | 38 +--------- microservices/md_gateway/Dockerfile | 26 +++---- microservices/md_gateway/build.sh | 91 +++++++++++++++++++++++ microservices/md_gateway/entrypoint.sh | 15 ++++ microservices/md_gateway/requirements.txt | 7 ++ microservices/md_gateway/run_mdgw.sh | 48 ------------ 6 files changed, 127 insertions(+), 98 deletions(-) create mode 100755 microservices/md_gateway/build.sh create mode 100755 microservices/md_gateway/entrypoint.sh create mode 100644 microservices/md_gateway/requirements.txt delete mode 100755 microservices/md_gateway/run_mdgw.sh diff --git a/microservices/docker-compose.yml b/microservices/docker-compose.yml index dd779c1..182d7d4 100644 --- a/microservices/docker-compose.yml +++ b/microservices/docker-compose.yml @@ -1,52 +1,22 @@ -version: "3.9" - +# CVTT Microservices services: md_gateway: image: cloud21.cvtt.vpn:5500/md_gateway:latest container_name: md_gateway environment: - - REDIS_HOST=redis - volumes: - - ./.creds:/.creds - - ./config:/config - - ./logs:/logs - - ./data:/data - depends_on: - - redis - - tester: - image: cloud21.cvtt.vpn:5500/tester:latest - container_name: tester - environment: - - REDIS_HOST=redis + CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} + MDGW_ADD_ARGS: ${MDGW_ADD_ARGS:-} volumes: - ./config:/config - ./logs:/logs - - ./data:/data depends_on: - redis - - md_gateway redis: image: redis:latest container_name: redis ports: - - "6379:6379" + - "16379:6379" volumes: - ./data/redis:/data - -# test_program: -# image: your_test_program_image:latest -# container_name: test_program -# environment: -# - REDIS_HOST=redis -# volumes: -# - ./config:/shared/config -# - ./logs:/shared/logs -# depends_on: -# - market_data_gateway -# - redis - -# volumes: -# redis_data: diff --git a/microservices/md_gateway/Dockerfile b/microservices/md_gateway/Dockerfile index 5a421a3..f0d0692 100644 --- a/microservices/md_gateway/Dockerfile +++ b/microservices/md_gateway/Dockerfile @@ -1,25 +1,19 @@ FROM python:3.12-slim -ARG ROOT_MCRSVC_DIR=docker_dev/microservices -ARG FROM_DIR=${ROOT_MCRSVC_DIR}/md_gateway +COPY requirements.txt / -COPY ${ROOT_MCRSVC_DIR}/requirements.txt / -RUN pip install --upgrade pip --root-user-action=ignore -RUN pip install -r /requirements.txt --root-user-action=ignore +RUN pip install --upgrade pip --root-user-action=ignore \ + pip install -r /requirements.txt --root-user-action=ignore COPY cvttpy /cvttpy -# COPY ${ROOT_MCRSVC_DIR}/.creds /.creds +RUN mkdir -p /logs /config -COPY ${FROM_DIR}/run_mdgw.sh /run_mdgw.sh -RUN chmod +x /run_mdgw.sh - -RUN mkdir /logs -RUN mkdir -p /config - - -WORKDIR / SHELL ["/bin/bash", "-c"] -ENV PYTHONPATH=/ -ENTRYPOINT [ "/run_mdgw.sh" ] +ENV PYTHONPATH=/ + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/microservices/md_gateway/build.sh b/microservices/md_gateway/build.sh new file mode 100755 index 0000000..17bbf27 --- /dev/null +++ b/microservices/md_gateway/build.sh @@ -0,0 +1,91 @@ +#!/bin/bash + +function usage { + echo "Usage: ${0} " + exit +} + +CvttpyVersion=${1} + +if [ "${CvttpyVersion}" == "" ] +then + usage +fi + +# --- Settings +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} + +function cleanup { + cd ${DockerDir} + rm -rf cvttpy +} +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 + + diff --git a/microservices/md_gateway/entrypoint.sh b/microservices/md_gateway/entrypoint.sh new file mode 100755 index 0000000..ade2a96 --- /dev/null +++ b/microservices/md_gateway/entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +ConfigDir=/config +Config="${ConfigDir}/cvtt_musvc.cfg" +Creds="${ConfigDir}/.creds" + +Cmd="python3.12" +Cmd+=" cvttpy/apps/microservices/market_gateways/md_gateway.py" +Cmd+=" --config=${Config}" +Cmd+=" --credentials_file=${Creds}" +Cmd+=" --log_file=/logs/%T.md_gateway.log" +Cmd+=" ${MDGW_ADD_ARGS}" +echo ${Cmd} +exec ${Cmd} + diff --git a/microservices/md_gateway/requirements.txt b/microservices/md_gateway/requirements.txt new file mode 100644 index 0000000..852e647 --- /dev/null +++ b/microservices/md_gateway/requirements.txt @@ -0,0 +1,7 @@ +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 diff --git a/microservices/md_gateway/run_mdgw.sh b/microservices/md_gateway/run_mdgw.sh deleted file mode 100755 index 95c11ca..0000000 --- a/microservices/md_gateway/run_mdgw.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# runs in container - -# runs on host to start container -usage() { - echo -n "Usage: ${0}" - echo -n " [-c ]" - echo -n " [-a ]" - echo -n " [-z (compress log)"] - echo - exit 1 -} - -Config=/config/cvtt.cfg -AdminPort=7220 -COMPRESS_LOG=false - - -while getopts "c:a:z" opt; do - case ${opt} in - c ) Config=$OPTARG ;; - a ) AdminPort=$OPTARG ;; - z ) COMPRESS_LOG=true ;; - \? ) - echo "Invalid option: -$OPTARG" >&2 - usage - ;; - : ) - echo "Option -$OPTARG requires an argument." >&2 - usage - ;; - esac -done - -Cmd="python3.12" -Cmd="${Cmd} cvttpy/apps/microservices/market_gateways/md_gateway.py" -Cmd="${Cmd} --config=${Config}" -Cmd="${Cmd} --credentials_file=/.creds" -Cmd="${Cmd} --admin_port=${AdminPort}" -Cmd="${Cmd} --log_file=/logs/%T.md_gateway.log" -if ${COMPRESS_LOG} ; then - Cmd="${Cmd} --compress_log" -fi -echo ${Cmd} -eval ${Cmd} - - From d0079d6f565da1490b9aa2dd88299833d4b1bdc5 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Thu, 27 Mar 2025 17:50:05 -0400 Subject: [PATCH 2/7] 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 From 6dd31615c5c2e8905f340a31bfc9d4746d9f0503 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Thu, 27 Mar 2025 18:09:40 -0400 Subject: [PATCH 3/7] oe_gateway docker image build --- microservices/docker-compose.yml | 12 +++++ microservices/md_gateway/Dockerfile | 4 +- microservices/oe_gateway/Dockerfile | 22 ++++----- microservices/oe_gateway/build.sh | 41 +++++++++++++++++ microservices/oe_gateway/entrypoint.sh | 15 +++++++ microservices/oe_gateway/requirements.txt | 7 +++ microservices/oe_gateway/run_oegw.sh | 48 -------------------- microservices/tester/.dockerignore | 3 -- microservices/tester/Dockerfile | 26 ----------- microservices/tester/run_tester.sh | 55 ----------------------- 10 files changed, 85 insertions(+), 148 deletions(-) create mode 100755 microservices/oe_gateway/build.sh create mode 100755 microservices/oe_gateway/entrypoint.sh create mode 100644 microservices/oe_gateway/requirements.txt delete mode 100755 microservices/oe_gateway/run_oegw.sh delete mode 100644 microservices/tester/.dockerignore delete mode 100644 microservices/tester/Dockerfile delete mode 100755 microservices/tester/run_tester.sh diff --git a/microservices/docker-compose.yml b/microservices/docker-compose.yml index 182d7d4..003cd34 100644 --- a/microservices/docker-compose.yml +++ b/microservices/docker-compose.yml @@ -12,6 +12,18 @@ services: depends_on: - redis + oe_gateway: + image: cloud21.cvtt.vpn:5500/oe_gateway:latest + container_name: oe_gateway + environment: + CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} + OEGW_ADD_ARGS: ${OEGW_ADD_ARGS:-} + volumes: + - ./config:/config + - ./logs:/logs + depends_on: + - redis + redis: image: redis:latest container_name: redis diff --git a/microservices/md_gateway/Dockerfile b/microservices/md_gateway/Dockerfile index f0d0692..33e3bc2 100644 --- a/microservices/md_gateway/Dockerfile +++ b/microservices/md_gateway/Dockerfile @@ -2,8 +2,8 @@ FROM python:3.12-slim COPY requirements.txt / -RUN pip install --upgrade pip --root-user-action=ignore \ - pip install -r /requirements.txt --root-user-action=ignore +RUN pip install --upgrade pip --root-user-action=ignore +RUN pip install -r /requirements.txt --root-user-action=ignore COPY cvttpy /cvttpy diff --git a/microservices/oe_gateway/Dockerfile b/microservices/oe_gateway/Dockerfile index 3a6649e..33e3bc2 100644 --- a/microservices/oe_gateway/Dockerfile +++ b/microservices/oe_gateway/Dockerfile @@ -1,25 +1,19 @@ FROM python:3.12-slim -ARG ROOT_MCRSVC_DIR=docker_dev/microservices -ARG FROM_DIR=${ROOT_MCRSVC_DIR}/oe_gateway +COPY requirements.txt / -COPY ${ROOT_MCRSVC_DIR}/requirements.txt / RUN pip install --upgrade pip --root-user-action=ignore RUN pip install -r /requirements.txt --root-user-action=ignore COPY cvttpy /cvttpy -COPY ${ROOT_MCRSVC_DIR}/.creds /.creds +RUN mkdir -p /logs /config -COPY ${FROM_DIR}/run_oegw.sh /run_oegw.sh -RUN chmod +x /run_oegw.sh - -RUN mkdir /logs -RUN mkdir -p /config - - -WORKDIR / SHELL ["/bin/bash", "-c"] -ENV PYTHONPATH=/ -ENTRYPOINT [ "/run_oegw.sh" ] +ENV PYTHONPATH=/ + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/microservices/oe_gateway/build.sh b/microservices/oe_gateway/build.sh new file mode 100755 index 0000000..e65da61 --- /dev/null +++ b/microservices/oe_gateway/build.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +function usage { + echo "Usage: ${0} " + exit +} + +CvttpyVersion=${1} + +if [ "${CvttpyVersion}" == "" ] +then + usage +fi + +# --- Settings +ImageName=oe_gateway +RegistryService=cloud21.cvtt.vpn:5500 +# --- Settings + + +DockerDir=$(realpath $(dirname ${0})) +Version=${CvttpyVersion} + +cd ${DockerDir} + +source ../mu_svc_functions.sh +get_project_version cvttpy ${Version} + +function cleanup { + cd ${DockerDir} + rm -rf cvttpy +} +trap cleanup 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/oe_gateway/entrypoint.sh b/microservices/oe_gateway/entrypoint.sh new file mode 100755 index 0000000..4f7409b --- /dev/null +++ b/microservices/oe_gateway/entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +ConfigDir=/config +Config="${ConfigDir}/cvtt_musvc.cfg" +Creds="${ConfigDir}/.creds" + +Cmd="python3.12" +Cmd+=" cvttpy/apps/microservices/market_gateways/order_entry_gateway.py" +Cmd+=" --config=${Config}" +Cmd+=" --credentials_file=${Creds}" +Cmd+=" --log_file=/logs/%T.oe_gateway.log" +Cmd+=" ${OEGW_ADD_ARGS}" +echo ${Cmd} +exec ${Cmd} + diff --git a/microservices/oe_gateway/requirements.txt b/microservices/oe_gateway/requirements.txt new file mode 100644 index 0000000..852e647 --- /dev/null +++ b/microservices/oe_gateway/requirements.txt @@ -0,0 +1,7 @@ +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 diff --git a/microservices/oe_gateway/run_oegw.sh b/microservices/oe_gateway/run_oegw.sh deleted file mode 100755 index af7f658..0000000 --- a/microservices/oe_gateway/run_oegw.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# runs in container - -# runs on host to start container -usage() { - echo -n "Usage: ${0}" - echo -n " [-c ]" - echo -n " [-a ]" - echo -n " [-z (compress log)"] - echo - exit 1 -} - -Config=/config/cvtt.cfg -AdminPort=7220 -COMPRESS_LOG=false - - -while getopts "c:a:z" opt; do - case ${opt} in - c ) Config=$OPTARG ;; - a ) AdminPort=$OPTARG ;; - z ) COMPRESS_LOG=true ;; - \? ) - echo "Invalid option: -$OPTARG" >&2 - usage - ;; - : ) - echo "Option -$OPTARG requires an argument." >&2 - usage - ;; - esac -done - -Cmd="python3.12" -Cmd="${Cmd} cvttpy/apps/microservices/market_gateways/order_entry_gateway.py" -Cmd="${Cmd} --config=${Config}" -Cmd="${Cmd} --credentials_file=/.creds" -Cmd="${Cmd} --admin_port=${AdminPort}" -Cmd="${Cmd} --log_file=/logs/%T.md_gateway.log" -if ${COMPRESS_LOG} ; then - Cmd="${Cmd} --compress_log" -fi -echo ${Cmd} -eval ${Cmd} - - diff --git a/microservices/tester/.dockerignore b/microservices/tester/.dockerignore deleted file mode 100644 index a4f7c14..0000000 --- a/microservices/tester/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -.git -**/__pycache__ -.pipenv \ No newline at end of file diff --git a/microservices/tester/Dockerfile b/microservices/tester/Dockerfile deleted file mode 100644 index 4f8e8ed..0000000 --- a/microservices/tester/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM python:3.12-slim - -ARG ROOT_MUSVC_DIR=docker_dev/microservices -ARG FROM_DIR=${ROOT_MUSVC_DIR}/tester - -COPY ${ROOT_MUSVC_DIR}/requirements.txt / -RUN pip install --upgrade pip --root-user-action=ignore -RUN pip install -r /requirements.txt --root-user-action=ignore - -COPY cvttpy /cvttpy -# COPY ${ROOT_MUSVC_DIR}/.creds /.creds - - -COPY ${FROM_DIR}/run_tester.sh /run_tester.sh -RUN chmod +x /run_tester.sh - -RUN mkdir /logs -RUN mkdir -p /config -RUN mkdir -p /data - - -WORKDIR / -SHELL ["/bin/bash", "-c"] -ENV PYTHONPATH=/ -ENTRYPOINT [ "/run_tester.sh" ] - diff --git a/microservices/tester/run_tester.sh b/microservices/tester/run_tester.sh deleted file mode 100755 index 748ff4a..0000000 --- a/microservices/tester/run_tester.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -# runs in container - -# runs on host to start container -usage() { - echo -n "Usage: ${0}" - echo -n " [-c ]" - echo -n " [-i ]" - echo -n " [-d ]" - echo -n " [-a ]" - echo -n " [-z (compress log (false))"] - echo - exit 1 -} - -Config=/config/cvtt.cfg -AdminPort=7221 -COMPRESS_LOG=false -Instruments="COINBASE:PAIR-BTC-USD,BNBFUT:PERP-BTC-USDT" -DataTypes="TRADES" - -while getopts "a:c:d:i:z" opt; do - case ${opt} in - c ) Config=$OPTARG ;; - a ) AdminPort=$OPTARG ;; - i ) Instruments=$OPTARG ;; - d ) DataTypes=$OPTARG ;; - z ) COMPRESS_LOG=true ;; - \? ) - echo "Invalid option: -$OPTARG" >&2 - usage - ;; - : ) - echo "Option -$OPTARG requires an argument." >&2 - usage - ;; - esac -done - -Cmd="python3.12" -Cmd="${Cmd} cvttpy/apps/microservices/tester/musvc_tester.py" -Cmd="${Cmd} --config=${Config}" -Cmd="${Cmd} --credentials_file=/.creds" -Cmd="${Cmd} --admin_port=${AdminPort}" -Cmd="${Cmd} --data_types=${DataTypes}" -Cmd="${Cmd} --instruments=${Instruments}" -Cmd="${Cmd} --log_file=/logs/%T.tester.log" -if ${COMPRESS_LOG} ; then - Cmd="${Cmd} --compress_log" -fi -echo ${Cmd} -eval ${Cmd} - - From fe1f2297443e4bb622390a313d454f7c1803c8e4 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Fri, 28 Mar 2025 18:07:14 -0400 Subject: [PATCH 4/7] DEV-85 DEV-90 DEV-86 --- microservices/ac_gateway/.dockerignore | 3 ++ microservices/ac_gateway/Dockerfile | 19 +++++++++++ microservices/ac_gateway/build.sh | 41 +++++++++++++++++++++++ microservices/ac_gateway/entrypoint.sh | 15 +++++++++ microservices/ac_gateway/requirements.txt | 10 ++++++ microservices/docker-compose.yml | 18 ++++++++-- microservices/md_gateway/requirements.txt | 2 ++ microservices/oe_gateway/requirements.txt | 4 +++ 8 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 microservices/ac_gateway/.dockerignore create mode 100644 microservices/ac_gateway/Dockerfile create mode 100755 microservices/ac_gateway/build.sh create mode 100755 microservices/ac_gateway/entrypoint.sh create mode 100644 microservices/ac_gateway/requirements.txt diff --git a/microservices/ac_gateway/.dockerignore b/microservices/ac_gateway/.dockerignore new file mode 100644 index 0000000..a4f7c14 --- /dev/null +++ b/microservices/ac_gateway/.dockerignore @@ -0,0 +1,3 @@ +.git +**/__pycache__ +.pipenv \ No newline at end of file diff --git a/microservices/ac_gateway/Dockerfile b/microservices/ac_gateway/Dockerfile new file mode 100644 index 0000000..33e3bc2 --- /dev/null +++ b/microservices/ac_gateway/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"] diff --git a/microservices/ac_gateway/build.sh b/microservices/ac_gateway/build.sh new file mode 100755 index 0000000..17e519b --- /dev/null +++ b/microservices/ac_gateway/build.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +function usage { + echo "Usage: ${0} " + exit +} + +CvttpyVersion=${1} + +if [ "${CvttpyVersion}" == "" ] +then + usage +fi + +# --- Settings +ImageName=ac_gateway +RegistryService=cloud21.cvtt.vpn:5500 +# --- Settings + + +DockerDir=$(realpath $(dirname ${0})) +Version=${CvttpyVersion} + +cd ${DockerDir} + +source ../mu_svc_functions.sh +get_project_version cvttpy ${Version} + +function cleanup { + cd ${DockerDir} + rm -rf cvttpy +} +trap cleanup 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/ac_gateway/entrypoint.sh b/microservices/ac_gateway/entrypoint.sh new file mode 100755 index 0000000..fc42a99 --- /dev/null +++ b/microservices/ac_gateway/entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +ConfigDir=/config +Config="${ConfigDir}/cvtt_musvc.cfg" +Creds="${ConfigDir}/.creds" + +Cmd="python3.12" +Cmd+=" cvttpy/apps/microservices/market_gateways/accounting_gateway.py" +Cmd+=" --config=${Config}" +Cmd+=" --credentials_file=${Creds}" +Cmd+=" --log_file=/logs/%T.ac_gateway.log" +Cmd+=" ${ACGW_ADD_ARGS}" +echo ${Cmd} +exec ${Cmd} + diff --git a/microservices/ac_gateway/requirements.txt b/microservices/ac_gateway/requirements.txt new file mode 100644 index 0000000..433ffc3 --- /dev/null +++ b/microservices/ac_gateway/requirements.txt @@ -0,0 +1,10 @@ +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 +jwt>=1.3.1 + diff --git a/microservices/docker-compose.yml b/microservices/docker-compose.yml index 003cd34..37c0635 100644 --- a/microservices/docker-compose.yml +++ b/microservices/docker-compose.yml @@ -1,7 +1,7 @@ # CVTT Microservices services: md_gateway: - image: cloud21.cvtt.vpn:5500/md_gateway:latest + image: cloud21.cvtt.vpn:5500/md_gateway:${CVTT_VERSION} container_name: md_gateway environment: CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} @@ -13,7 +13,7 @@ services: - redis oe_gateway: - image: cloud21.cvtt.vpn:5500/oe_gateway:latest + image: cloud21.cvtt.vpn:5500/oe_gateway:${CVTT_VERSION} container_name: oe_gateway environment: CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} @@ -24,9 +24,21 @@ services: depends_on: - redis + ac_gateway: + image: cloud21.cvtt.vpn:5500/ac_gateway:${CVTT_VERSION} + container_name: ac_gateway + environment: + CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789} + ACGW_ADD_ARGS: ${ACGW_ADD_ARGS:-} + volumes: + - ./config:/config + - ./logs:/logs + depends_on: + - redis + redis: image: redis:latest - container_name: redis + container_name: redis-cvtt ports: - "16379:6379" volumes: diff --git a/microservices/md_gateway/requirements.txt b/microservices/md_gateway/requirements.txt index 852e647..d837c8c 100644 --- a/microservices/md_gateway/requirements.txt +++ b/microservices/md_gateway/requirements.txt @@ -5,3 +5,5 @@ sortedcontainers>=2.4.0 redis>=5.0.8 python-dateutil>=2.8.2 types-python-dateutil>=2.8.19.6 +cryptography>=43.0.0 +jwt>=1.3.1 diff --git a/microservices/oe_gateway/requirements.txt b/microservices/oe_gateway/requirements.txt index 852e647..3b39e97 100644 --- a/microservices/oe_gateway/requirements.txt +++ b/microservices/oe_gateway/requirements.txt @@ -5,3 +5,7 @@ sortedcontainers>=2.4.0 redis>=5.0.8 python-dateutil>=2.8.2 types-python-dateutil>=2.8.19.6 +cryptography>=43.0.0 +jwt>=1.3.1 + + From 25a262b01ff13b0f63c0b4bed5d620990d904c3c Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Thu, 3 Apr 2025 22:56:06 -0400 Subject: [PATCH 5/7] DEV-98 improved build.sh for microservices --- VERSION | 2 +- microservices/.env | 18 ++++++ microservices/ac_gateway/build.sh | 41 ------------ microservices/ac_gateway/entrypoint.sh | 9 ++- microservices/ac_gateway/requirements.txt | 3 +- microservices/build.sh | 79 +++++++++++++++++++++++ microservices/docker-compose.yml | 12 ++++ microservices/md_gateway/build.sh | 41 ------------ microservices/md_gateway/entrypoint.sh | 9 ++- microservices/md_gateway/requirements.txt | 2 +- microservices/oe_gateway/build.sh | 41 ------------ microservices/oe_gateway/entrypoint.sh | 9 ++- microservices/oe_gateway/requirements.txt | 2 +- 13 files changed, 125 insertions(+), 143 deletions(-) create mode 100644 microservices/.env delete mode 100755 microservices/ac_gateway/build.sh create mode 100755 microservices/build.sh delete mode 100755 microservices/md_gateway/build.sh delete mode 100755 microservices/oe_gateway/build.sh diff --git a/VERSION b/VERSION index 8e6b67e..80db2c2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.5,microservices initial \ No newline at end of file +0.2.6,improved build.sh for microservices \ No newline at end of file diff --git a/microservices/.env b/microservices/.env new file mode 100644 index 0000000..d85fac7 --- /dev/null +++ b/microservices/.env @@ -0,0 +1,18 @@ +CVTT_USER=1000:1000 +CVTT_VERSION=0.0.1 + +# MDGW_CONFIG_FILE=config_musvc.cfg +# MDGW_CREDS_FILE=.creds +MDGW_LOG_FILE=%D.md_gateway.log +MDGW_ADD_ARGS= + +# OEGW_CONFIG_FILE=config_musvc.cfg +# OEGW_CREDS_FILE=.creds +OEGW_LOG_FILE=%D.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_ADD_ARGS= diff --git a/microservices/ac_gateway/build.sh b/microservices/ac_gateway/build.sh deleted file mode 100755 index 17e519b..0000000 --- a/microservices/ac_gateway/build.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -function usage { - echo "Usage: ${0} " - exit -} - -CvttpyVersion=${1} - -if [ "${CvttpyVersion}" == "" ] -then - usage -fi - -# --- Settings -ImageName=ac_gateway -RegistryService=cloud21.cvtt.vpn:5500 -# --- Settings - - -DockerDir=$(realpath $(dirname ${0})) -Version=${CvttpyVersion} - -cd ${DockerDir} - -source ../mu_svc_functions.sh -get_project_version cvttpy ${Version} - -function cleanup { - cd ${DockerDir} - rm -rf cvttpy -} -trap cleanup 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/ac_gateway/entrypoint.sh b/microservices/ac_gateway/entrypoint.sh index fc42a99..5c6e64c 100755 --- a/microservices/ac_gateway/entrypoint.sh +++ b/microservices/ac_gateway/entrypoint.sh @@ -1,14 +1,13 @@ #!/bin/bash ConfigDir=/config -Config="${ConfigDir}/cvtt_musvc.cfg" -Creds="${ConfigDir}/.creds" +LogDir=/logs Cmd="python3.12" Cmd+=" cvttpy/apps/microservices/market_gateways/accounting_gateway.py" -Cmd+=" --config=${Config}" -Cmd+=" --credentials_file=${Creds}" -Cmd+=" --log_file=/logs/%T.ac_gateway.log" +Cmd+=" --config=${ConfigDir}/${ACGW_CONFIG_FILE:-cvtt_musvc.cfg}" +Cmd+=" --credentials_file=${ConfigDir}/${ACGW_CREDS_FILE:-.creds}" +Cmd+=" --log_file=${LogDir}/${ACGW_LOG_FILE:-%T.ac_gateway.log}" Cmd+=" ${ACGW_ADD_ARGS}" echo ${Cmd} exec ${Cmd} diff --git a/microservices/ac_gateway/requirements.txt b/microservices/ac_gateway/requirements.txt index 433ffc3..e840a84 100644 --- a/microservices/ac_gateway/requirements.txt +++ b/microservices/ac_gateway/requirements.txt @@ -6,5 +6,4 @@ redis>=5.0.8 python-dateutil>=2.8.2 types-python-dateutil>=2.8.19.6 cryptography>=43.0.0 -jwt>=1.3.1 - +PyJWT>=2.10.1 diff --git a/microservices/build.sh b/microservices/build.sh new file mode 100755 index 0000000..15de65c --- /dev/null +++ b/microservices/build.sh @@ -0,0 +1,79 @@ +#!/bin/bash + + +usage() { + echo "Usage: $0 -I -V -L :" + exit 1 +} + +# --- Settings +RegistryService=cloud21.cvtt.vpn:5500 +# --- Settings + + +# ---------------- cmdline +while getopts "I:V:L:" opt; do + case ${opt} in + I ) + ImageName=$OPTARG + ;; + V ) + ImageVersion=$OPTARG + ;; + L ) + Library=$OPTARG + ;; + \? ) + echo "Invalid option: -$OPTARG" >&2 + usage + ;; + : ) + echo "Option -$OPTARG requires an argument." >&2 + usage + ;; + esac +done +# ---------------- cmdline + +if [ "${ImageName}" == "" ] +then + usage +fi + +if [ "${ImageVersion}" == "" ] +then + usage +fi + +Project= +ProjectVersion= +if [ "${Library}" != "" ] ; then + IFS=':' read -ra parts <<< "${Library}" + Project=${parts[0]} + ProjectVersion=${parts[1]} +fi +# exit + +DockerDir=$(realpath $(dirname ${0})/${ImageName}) + +cd ${DockerDir} + +source ../mu_svc_functions.sh +if [ "${Project}" != "" ]; then + get_project_version ${Project} ${ProjectVersion} +fi + + +function cleanup { + cd ${DockerDir} + rm -rf cvttpy +} +trap cleanup EXIT + +build_docker_image ${ImageName} ${RegistryService} ${ImageVersion} + + +# echo "**** D E B U G E X I T" && exit +echo "***** ${0} D O N E" + + diff --git a/microservices/docker-compose.yml b/microservices/docker-compose.yml index 37c0635..2b11228 100644 --- a/microservices/docker-compose.yml +++ b/microservices/docker-compose.yml @@ -3,8 +3,12 @@ services: md_gateway: image: cloud21.cvtt.vpn:5500/md_gateway:${CVTT_VERSION} container_name: md_gateway + 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} + MDGW_LOG_FILE: ${MDGW_LOG_FILE:-%T.md_gateway.log} MDGW_ADD_ARGS: ${MDGW_ADD_ARGS:-} volumes: - ./config:/config @@ -15,8 +19,12 @@ services: oe_gateway: image: cloud21.cvtt.vpn:5500/oe_gateway:${CVTT_VERSION} container_name: oe_gateway + 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} + OEGW_LOG_FILE: ${OEGW_LOG_FILE:-%T.oe_gateway.log} OEGW_ADD_ARGS: ${OEGW_ADD_ARGS:-} volumes: - ./config:/config @@ -27,8 +35,12 @@ services: ac_gateway: image: cloud21.cvtt.vpn:5500/ac_gateway:${CVTT_VERSION} container_name: ac_gateway + 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} + ACGW_LOG_FILE: ${ACGW_LOG_FILE:-%T.ac_gateway.log} ACGW_ADD_ARGS: ${ACGW_ADD_ARGS:-} volumes: - ./config:/config diff --git a/microservices/md_gateway/build.sh b/microservices/md_gateway/build.sh deleted file mode 100755 index 6c4ca24..0000000 --- a/microservices/md_gateway/build.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -function usage { - echo "Usage: ${0} " - exit -} - -CvttpyVersion=${1} - -if [ "${CvttpyVersion}" == "" ] -then - usage -fi - -# --- Settings -ImageName=md_gateway -RegistryService=cloud21.cvtt.vpn:5500 -# --- Settings - - -DockerDir=$(realpath $(dirname ${0})) -Version=${CvttpyVersion} - -cd ${DockerDir} - -source ../mu_svc_functions.sh -get_project_version cvttpy ${Version} - -function cleanup { - cd ${DockerDir} - rm -rf cvttpy -} -trap cleanup 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/md_gateway/entrypoint.sh b/microservices/md_gateway/entrypoint.sh index ade2a96..69ed4ec 100755 --- a/microservices/md_gateway/entrypoint.sh +++ b/microservices/md_gateway/entrypoint.sh @@ -1,14 +1,13 @@ #!/bin/bash ConfigDir=/config -Config="${ConfigDir}/cvtt_musvc.cfg" -Creds="${ConfigDir}/.creds" +LogDir=/logs Cmd="python3.12" Cmd+=" cvttpy/apps/microservices/market_gateways/md_gateway.py" -Cmd+=" --config=${Config}" -Cmd+=" --credentials_file=${Creds}" -Cmd+=" --log_file=/logs/%T.md_gateway.log" +Cmd+=" --config=${ConfigDir}/${MDGW_CONFIG_FILE:-cvtt_musvc.cfg}" +Cmd+=" --credentials_file=${ConfigDir}/${MDGW_CREDS_FILE:-.creds}" +Cmd+=" --log_file=${LogDir}/${MDGW_LOG_FILE:-%T.md_gateway.log}" Cmd+=" ${MDGW_ADD_ARGS}" echo ${Cmd} exec ${Cmd} diff --git a/microservices/md_gateway/requirements.txt b/microservices/md_gateway/requirements.txt index d837c8c..e840a84 100644 --- a/microservices/md_gateway/requirements.txt +++ b/microservices/md_gateway/requirements.txt @@ -6,4 +6,4 @@ redis>=5.0.8 python-dateutil>=2.8.2 types-python-dateutil>=2.8.19.6 cryptography>=43.0.0 -jwt>=1.3.1 +PyJWT>=2.10.1 diff --git a/microservices/oe_gateway/build.sh b/microservices/oe_gateway/build.sh deleted file mode 100755 index e65da61..0000000 --- a/microservices/oe_gateway/build.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -function usage { - echo "Usage: ${0} " - exit -} - -CvttpyVersion=${1} - -if [ "${CvttpyVersion}" == "" ] -then - usage -fi - -# --- Settings -ImageName=oe_gateway -RegistryService=cloud21.cvtt.vpn:5500 -# --- Settings - - -DockerDir=$(realpath $(dirname ${0})) -Version=${CvttpyVersion} - -cd ${DockerDir} - -source ../mu_svc_functions.sh -get_project_version cvttpy ${Version} - -function cleanup { - cd ${DockerDir} - rm -rf cvttpy -} -trap cleanup 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/oe_gateway/entrypoint.sh b/microservices/oe_gateway/entrypoint.sh index 4f7409b..af08fa4 100755 --- a/microservices/oe_gateway/entrypoint.sh +++ b/microservices/oe_gateway/entrypoint.sh @@ -1,14 +1,13 @@ #!/bin/bash ConfigDir=/config -Config="${ConfigDir}/cvtt_musvc.cfg" -Creds="${ConfigDir}/.creds" +LogDir=/logs Cmd="python3.12" Cmd+=" cvttpy/apps/microservices/market_gateways/order_entry_gateway.py" -Cmd+=" --config=${Config}" -Cmd+=" --credentials_file=${Creds}" -Cmd+=" --log_file=/logs/%T.oe_gateway.log" +Cmd+=" --config=${ConfigDir}/${OEGW_CONFIG_FILE:-cvtt_musvc.cfg}" +Cmd+=" --credentials_file=${ConfigDir}/${OEGW_CREDS_FILE:-.creds}" +Cmd+=" --log_file=${LogDir}/${OEGW_LOG_FILE:-%T.oe_gateway.log}" Cmd+=" ${OEGW_ADD_ARGS}" echo ${Cmd} exec ${Cmd} diff --git a/microservices/oe_gateway/requirements.txt b/microservices/oe_gateway/requirements.txt index 3b39e97..d23f46d 100644 --- a/microservices/oe_gateway/requirements.txt +++ b/microservices/oe_gateway/requirements.txt @@ -6,6 +6,6 @@ redis>=5.0.8 python-dateutil>=2.8.2 types-python-dateutil>=2.8.19.6 cryptography>=43.0.0 -jwt>=1.3.1 +PyJWT>=2.10.1 From 0cb9eeafd2c5a0992a972d2db369d31662325dee Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Sat, 5 Apr 2025 19:22:34 -0400 Subject: [PATCH 6/7] added version information to the image --- microservices/build.sh | 2 +- microservices/mu_svc_functions.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/microservices/build.sh b/microservices/build.sh index 15de65c..afa16ab 100755 --- a/microservices/build.sh +++ b/microservices/build.sh @@ -70,7 +70,7 @@ function cleanup { } trap cleanup EXIT -build_docker_image ${ImageName} ${RegistryService} ${ImageVersion} +build_docker_image ${ImageName} ${RegistryService} ${ImageVersion} ${Project} ${ProjectVersion} # echo "**** D E B U G E X I T" && exit diff --git a/microservices/mu_svc_functions.sh b/microservices/mu_svc_functions.sh index 6d78a0c..c9e3351 100755 --- a/microservices/mu_svc_functions.sh +++ b/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}" From bbcc5a95410ae8aa7d23d600b87243f61647416a Mon Sep 17 00:00:00 2001 From: Cryptoval Trading Technologies Date: Sun, 6 Apr 2025 01:19:45 +0000 Subject: [PATCH 7/7] progress --- microservices/.env | 4 ++-- microservices/docker-compose.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/microservices/.env b/microservices/.env index d85fac7..412fd15 100644 --- a/microservices/.env +++ b/microservices/.env @@ -1,5 +1,5 @@ -CVTT_USER=1000:1000 -CVTT_VERSION=0.0.1 +CVTT_USER=1001:1001 +CVTT_VERSION=0.0.3 # MDGW_CONFIG_FILE=config_musvc.cfg # MDGW_CREDS_FILE=.creds diff --git a/microservices/docker-compose.yml b/microservices/docker-compose.yml index 2b11228..68b87ba 100644 --- a/microservices/docker-compose.yml +++ b/microservices/docker-compose.yml @@ -3,6 +3,7 @@ services: 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} @@ -19,6 +20,7 @@ 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} @@ -35,6 +37,7 @@ 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}