From 26d0b1a4e02ca8641aaa57b8b8b0ca424b508039 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Mon, 9 Sep 2024 20:44:49 -0400 Subject: [PATCH] config (for all trading images) is made more flexible, docker compose initial --- .../md_portal/start_docker_md_portal.sh | 12 +--- docker/trading/compose/.env | 3 +- docker/trading/compose/docker-compose.yml | 6 +- .../trading/executor/start_docker_executor.sh | 50 ++++++------- docker/trading/quant/start_docker_quant.sh | 70 +++++++++--------- .../trading/risk_mgr/start_docker_risk_mgr.sh | 62 ++++++++-------- docker/trading/trader/start_docker_trader.sh | 71 +++++++++---------- .../start_docker_trading_recorder.sh | 64 ++++++++--------- release_version.txt | 2 +- 9 files changed, 166 insertions(+), 174 deletions(-) diff --git a/docker/market_data/md_portal/start_docker_md_portal.sh b/docker/market_data/md_portal/start_docker_md_portal.sh index 5e7a6f5..d2d2867 100755 --- a/docker/market_data/md_portal/start_docker_md_portal.sh +++ b/docker/market_data/md_portal/start_docker_md_portal.sh @@ -2,8 +2,7 @@ usage() { echo -n "Usage: ${0}" - echo -n " [-C ]" - echo -n " [-c ]" + echo -n " [-c ]" echo -n " [-e ]" echo -n " [-a ]" echo -n " [-n ]" @@ -14,19 +13,15 @@ usage() { args=${*} -Config=apps/cvtt_eqt_alpaca -ConfigServer=cloud23.cvtt.vpn:6789 +Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca ActiveExchanges=ALPACA_SNDBX PortalName=MD_PORTAL_ALPACA_SNDBX AdminPort=7220 while getopts ":C:c:e:a:n:" opt; do case ${opt} in - C ) - Config=$OPTARG - ;; c ) - ConfigServer=$OPTARG + Config=$OPTARG ;; e ) ActiveExchanges=$OPTARG @@ -49,7 +44,6 @@ while getopts ":C:c:e:a:n:" opt; do done echo "Config=${Config}" -echo "ConfigServer=${ConfigServer}" echo "ActiveExchanges=${ActiveExchanges}" echo "PortalName=${PortalName}" echo "AdminPort=${AdminPort}" diff --git a/docker/trading/compose/.env b/docker/trading/compose/.env index 5fdb00a..acad6b8 100644 --- a/docker/trading/compose/.env +++ b/docker/trading/compose/.env @@ -1,5 +1,6 @@ BOOK=ALPACA-TEST-BOOK-01 -CONFIG=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca +CONFIG=/config/cvtt_eqty_alpaca.cfg ACTIVE_EXCHANGES=ALPACA_SNDBX-MDPORTAL # ADMIN_PORT_EXECUTOR=7222 + diff --git a/docker/trading/compose/docker-compose.yml b/docker/trading/compose/docker-compose.yml index 33cf859..9bb7570 100644 --- a/docker/trading/compose/docker-compose.yml +++ b/docker/trading/compose/docker-compose.yml @@ -6,7 +6,7 @@ version: "3.8" # ACTIVE_EXCHANGES # ADMIN_PORT_EXECUTOR # Start with the command: -# docker compose up -d --pull +# docker compose up -d --pull=always #================================================== services: redis: @@ -22,6 +22,8 @@ services: depends_on: - redis volumes: - - /opt/shared:/shared + - /opt/cvtt/shared:/shared + - /opt/cvtt/logs:/logs + - /opt/cvtt/config:/config command: ["-c", "${CONFIG}", "-e", "${ACTIVE_EXCHANGES}", "-a", "${ADMIN_PORT_EXECUTOR}"] shm_size: "8gb" diff --git a/docker/trading/executor/start_docker_executor.sh b/docker/trading/executor/start_docker_executor.sh index 96fa22f..92832da 100755 --- a/docker/trading/executor/start_docker_executor.sh +++ b/docker/trading/executor/start_docker_executor.sh @@ -1,12 +1,12 @@ #!/bin/bash usage() { - echo -n "Usage: $0" - echo -n " [-c ]" - echo -n " [-e ]" - echo -n " [-a "] - echo - exit 1 + echo -n "Usage: $0" + echo -n " [-c ]" + echo -n " [-e ]" + echo -n " [-a "] + echo + exit 1 } args=${*} @@ -17,25 +17,25 @@ AdminPort=7222 Book="" while getopts ":c:e:a:" opt; do - case ${opt} in - c ) - Config=$OPTARG - ;; - e ) - ActiveExchanges=$OPTARG - ;; - a ) - AdminPort=$OPTARG - ;; - \? ) - echo "Invalid option: -$OPTARG" >&2 - usage - ;; - : ) - echo "Option -$OPTARG requires an argument." >&2 - usage - ;; - esac + case ${opt} in + c ) + Config=$OPTARG + ;; + e ) + ActiveExchanges=$OPTARG + ;; + a ) + AdminPort=$OPTARG + ;; + \? ) + echo "Invalid option: -$OPTARG" >&2 + usage + ;; + : ) + echo "Option -$OPTARG requires an argument." >&2 + usage + ;; + esac done echo "Config=${Config}" diff --git a/docker/trading/quant/start_docker_quant.sh b/docker/trading/quant/start_docker_quant.sh index 46eca03..233972f 100755 --- a/docker/trading/quant/start_docker_quant.sh +++ b/docker/trading/quant/start_docker_quant.sh @@ -1,21 +1,21 @@ #!/bin/bash usage() { - echo -n "Usage: $0" - echo -n " -b " + echo -n "Usage: $0" + echo -n " -b " - echo -n " -S (dflt: TRDALGO_001)" + echo -n " -S (dflt: TRDALGO_001)" - echo -n " [-c ]" - echo -n " [-e ]" - echo -n " [-a "] - echo - exit 1 + echo -n " [-c ]" + echo -n " [-e ]" + echo -n " [-a "] + echo + exit 1 } args=${*} -ConfigServer=cloud23.cvtt.vpn:6789 +Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca ActiveExchanges=ALPACA_SNDBX-MDPORTAL AdminPort=7224 Strategy=DAILY_STOCK_001 @@ -23,31 +23,31 @@ Book="" while getopts ":b:c:e:a:S:" opt; do - case ${opt} in - c ) - ConfigServer=$OPTARG - ;; - e ) - ActiveExchanges=$OPTARG - ;; - a ) - AdminPort=$OPTARG - ;; - b ) - Book=$OPTARG - ;; - S ) - Strategy=$OPTARG - ;; - \? ) - echo "Invalid option: -$OPTARG" >&2 - usage - ;; - : ) - echo "Option -$OPTARG requires an argument." >&2 - usage - ;; - esac + case ${opt} in + c ) + Config=$OPTARG + ;; + e ) + ActiveExchanges=$OPTARG + ;; + a ) + AdminPort=$OPTARG + ;; + b ) + Book=$OPTARG + ;; + S ) + Strategy=$OPTARG + ;; + \? ) + echo "Invalid option: -$OPTARG" >&2 + usage + ;; + : ) + echo "Option -$OPTARG requires an argument." >&2 + usage + ;; + esac done if [ "${Book}" == "" ]; then @@ -55,7 +55,7 @@ if [ "${Book}" == "" ]; then usage fi -echo "ConfigServer=${ConfigServer}" +echo "Config=${Config}" echo "ActiveExchanges=${ActiveExchanges}" echo "Book=${Book}" echo "Strategy=${Strategy}" diff --git a/docker/trading/risk_mgr/start_docker_risk_mgr.sh b/docker/trading/risk_mgr/start_docker_risk_mgr.sh index e56b533..7ec4d48 100755 --- a/docker/trading/risk_mgr/start_docker_risk_mgr.sh +++ b/docker/trading/risk_mgr/start_docker_risk_mgr.sh @@ -1,51 +1,51 @@ #!/bin/bash usage() { - echo -n "Usage: $0" - echo -n " -b " - echo -n " [-c ]" - echo -n " [-e ]" - echo -n " [-a "] - echo - exit 1 + echo -n "Usage: $0" + echo -n " -b " + echo -n " [-c ]" + echo -n " [-e ]" + echo -n " [-a "] + echo + exit 1 } args=${*} -ConfigServer=cloud23.cvtt.vpn:6789 +Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca ActiveExchanges=ALPACA_SNDBX-MDPORTAL AdminPort=7223 Book="" while getopts ":b:c:e:a:" opt; do - case ${opt} in - c ) - ConfigServer=$OPTARG - ;; - e ) - ActiveExchanges=$OPTARG - ;; - a ) - AdminPort=$OPTARG - ;; - b ) - Book=$OPTARG - ;; - \? ) - echo "Invalid option: -$OPTARG" >&2 - usage - ;; - : ) - echo "Option -$OPTARG requires an argument." >&2 - usage - ;; - esac + case ${opt} in + c ) + Config=$OPTARG + ;; + e ) + ActiveExchanges=$OPTARG + ;; + a ) + AdminPort=$OPTARG + ;; + b ) + Book=$OPTARG + ;; + \? ) + echo "Invalid option: -$OPTARG" >&2 + usage + ;; + : ) + echo "Option -$OPTARG requires an argument." >&2 + usage + ;; + esac done -echo "ConfigServer=${ConfigServer}" +echo "Config=${Config}" echo "ActiveExchanges=${ActiveExchanges}" echo "Book=${Book}" echo "AdminPort=${AdminPort}" diff --git a/docker/trading/trader/start_docker_trader.sh b/docker/trading/trader/start_docker_trader.sh index 1fb0a69..ca42afb 100755 --- a/docker/trading/trader/start_docker_trader.sh +++ b/docker/trading/trader/start_docker_trader.sh @@ -1,23 +1,22 @@ #!/bin/bash usage() { - echo -n "Usage: $0" - echo -n " -b " + echo -n "Usage: $0" + echo -n " -b " - echo -n " -A (dflt: TRDALGO_001)" + echo -n " -A (dflt: TRDALGO_001)" - echo -n " [-c ]" - echo -n " [-e ]" - echo -n " [-a "] - echo - exit 1 + echo -n " [-c ]" + echo -n " [-e ]" + echo -n " [-a "] + echo + exit 1 } args=${*} -# ConfigServer=cloud16.cvtt.vpn -ConfigServer=cloud23.cvtt.vpn:6789 +Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca ActiveExchanges=ALPACA_SNDBX-MDPORTAL AdminPort=7226 Algo=TRDALGO_001 @@ -25,31 +24,31 @@ Book="" while getopts ":b:c:e:a:" opt; do - case ${opt} in - c ) - ConfigServer=$OPTARG - ;; - e ) - ActiveExchanges=$OPTARG - ;; - a ) - AdminPort=$OPTARG - ;; - b ) - Book=$OPTARG - ;; - A ) - Algo=$OPTARG - ;; - \? ) - echo "Invalid option: -$OPTARG" >&2 - usage - ;; - : ) - echo "Option -$OPTARG requires an argument." >&2 - usage - ;; - esac + case ${opt} in + c ) + Config=$OPTARG + ;; + e ) + ActiveExchanges=$OPTARG + ;; + a ) + AdminPort=$OPTARG + ;; + b ) + Book=$OPTARG + ;; + A ) + Algo=$OPTARG + ;; + \? ) + echo "Invalid option: -$OPTARG" >&2 + usage + ;; + : ) + echo "Option -$OPTARG requires an argument." >&2 + usage + ;; + esac done if [ "${Book}" == "" ]; then @@ -57,7 +56,7 @@ if [ "${Book}" == "" ]; then usage fi -echo "ConfigServer=${ConfigServer}" +echo "Config=${Config}" echo "ActiveExchanges=${ActiveExchanges}" echo "Book=${Book}" echo "Algo=${Algo}" diff --git a/docker/trading/trading_recorder/start_docker_trading_recorder.sh b/docker/trading/trading_recorder/start_docker_trading_recorder.sh index af0e74a..27da24a 100755 --- a/docker/trading/trading_recorder/start_docker_trading_recorder.sh +++ b/docker/trading/trading_recorder/start_docker_trading_recorder.sh @@ -1,49 +1,46 @@ #!/bin/bash usage() { - echo -n "Usage: $0" - echo -n " -b " - echo -n " [-C ]" - echo -n " [-c ]" - echo -n " [-e ]" - echo -n " [-a "] - echo - exit 1 + echo -n "Usage: $0" + echo -n " -b " + echo -n " [-c ]" + echo -n " [-e ]" + echo -n " [-a "] + echo + exit 1 } args=${*} -# ConfigServer=cloud16.cvtt.vpn -ConfigServer=cloud23.cvtt.vpn:6789 +Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca ActiveExchanges=ALPACA_SNDBX-MDPORTAL AdminPort=7225 Book="" -Config=apps/cvtt_eqt_alpaca while getopts ":C:b:c:e:a:" opt; do - case ${opt} in - c ) - ConfigServer=$OPTARG - ;; - e ) - ActiveExchanges=$OPTARG - ;; - a ) - AdminPort=$OPTARG - ;; - b ) - Book=$OPTARG - ;; - \? ) - echo "Invalid option: -$OPTARG" >&2 - usage - ;; - : ) - echo "Option -$OPTARG requires an argument." >&2 - usage - ;; - esac + case ${opt} in + c ) + Config=$OPTARG + ;; + e ) + ActiveExchanges=$OPTARG + ;; + a ) + AdminPort=$OPTARG + ;; + b ) + Book=$OPTARG + ;; + \? ) + echo "Invalid option: -$OPTARG" >&2 + usage + ;; + : ) + echo "Option -$OPTARG requires an argument." >&2 + usage + ;; + esac done if [ "${Book}" == "" ]; then @@ -52,7 +49,6 @@ if [ "${Book}" == "" ]; then fi echo "Config=${Config}" -echo "ConfigServer=${ConfigServer}" echo "ActiveExchanges=${ActiveExchanges}" echo "Book=${Book}" echo "AdminPort=${AdminPort}" diff --git a/release_version.txt b/release_version.txt index cae9018..7076318 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.6.6,config (for executor) is made more flexible, docker compose initial +1.6.7,config (for all trading images) is made more flexible, docker compose initial