diff --git a/config_service/Dockerfile b/config_service/Dockerfile index a309f31..1edd5fe 100644 --- a/config_service/Dockerfile +++ b/config_service/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim WORKDIR / COPY docker_dev/config_service/requirements.txt / @@ -13,7 +13,7 @@ RUN mkdir /logs ENV PYTHONPATH=/ CMD [ \ - "python3.10", \ + "python3.12", \ "cvttpy/apps/utils/config_server.py", \ "--port=6789", \ "--root=/app/data", \ diff --git a/market_data/alpaca_md_day/Dockerfile b/market_data/alpaca_md_day/Dockerfile index 86222c0..8af44d6 100644 --- a/market_data/alpaca_md_day/Dockerfile +++ b/market_data/alpaca_md_day/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/market_data/alpaca_md_day diff --git a/market_data/alpaca_md_day/alpaca_md_day.sh b/market_data/alpaca_md_day/alpaca_md_day.sh index 8a4706d..6ffffe6 100755 --- a/market_data/alpaca_md_day/alpaca_md_day.sh +++ b/market_data/alpaca_md_day/alpaca_md_day.sh @@ -2,7 +2,7 @@ # --- Settings export PYTHONPATH=/ -export Python=python3.10 +export Python=python3.12 export Config=http://cloud16.cvtt.vpn:6789/apps/minimal_md export PyScript=/cvttpy/exchanges/alpaca/hist_md/hist_md_bars.py diff --git a/market_data/crypto_md_day/Dockerfile b/market_data/crypto_md_day/Dockerfile index 268f20a..ed5dd65 100644 --- a/market_data/crypto_md_day/Dockerfile +++ b/market_data/crypto_md_day/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/market_data/crypto_md_day @@ -14,7 +14,7 @@ RUN pip install -r /requirements.txt --root-user-action=ignore RUN apt-get update && apt-get install -y \ libpq-dev \ - build-essential + build-essential RUN apt-get update && apt-get install -y rsync openssh-client COPY docker_dev/shared/id_rsa /root/.ssh/id_rsa diff --git a/market_data/crypto_md_day/crypto_md_day.sh b/market_data/crypto_md_day/crypto_md_day.sh index d712be6..1611dc2 100755 --- a/market_data/crypto_md_day/crypto_md_day.sh +++ b/market_data/crypto_md_day/crypto_md_day.sh @@ -50,7 +50,7 @@ fi export PYTHONPATH=/ -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/research/utils/archive_ts_md.py" Cmd="${Cmd} --config=http://cloud16.cvtt.vpn:6789/apps/md_recorder" Cmd="${Cmd} --db_credentials_key=${CredKey}" diff --git a/market_data/md_portal/Dockerfile b/market_data/md_portal/Dockerfile index 79cd66d..89af514 100644 --- a/market_data/md_portal/Dockerfile +++ b/market_data/md_portal/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/market_data/md_portal diff --git a/market_data/md_portal/run_md_portal.sh b/market_data/md_portal/run_md_portal.sh index 2680609..d1ea540 100755 --- a/market_data/md_portal/run_md_portal.sh +++ b/market_data/md_portal/run_md_portal.sh @@ -51,7 +51,7 @@ while getopts ":C:c:e:a:n:" opt; do done -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/apps/md/md_portal.py" Cmd="${Cmd} --config=http://${ConfigServer}/${Config}" Cmd="${Cmd} --credentials_file=/.creds" diff --git a/market_data/md_recorder/Dockerfile b/market_data/md_recorder/Dockerfile index a56857a..4e77fa9 100644 --- a/market_data/md_recorder/Dockerfile +++ b/market_data/md_recorder/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/market_data/md_recorder diff --git a/market_data/md_recorder/run_md_recorder.sh b/market_data/md_recorder/run_md_recorder.sh index e28df0e..2e08deb 100755 --- a/market_data/md_recorder/run_md_recorder.sh +++ b/market_data/md_recorder/run_md_recorder.sh @@ -29,7 +29,7 @@ fi # ConfigServer=cloud16.cvtt.vpn ConfigServer=cloud23.cvtt.vpn:6789 -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/apps/md/md_recorder.py" Cmd="${Cmd} --config=http://${ConfigServer}/apps/md_recorder" Cmd="${Cmd} --credentials_file=/.creds" diff --git a/market_data/md_recorder_monitor/Dockerfile b/market_data/md_recorder_monitor/Dockerfile index 05accdc..2ce5e80 100644 --- a/market_data/md_recorder_monitor/Dockerfile +++ b/market_data/md_recorder_monitor/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/market_data/md_recorder_monitor diff --git a/market_data/md_recorder_monitor/run_mdr_monitor.sh b/market_data/md_recorder_monitor/run_mdr_monitor.sh index fbc2afa..3e884bc 100755 --- a/market_data/md_recorder_monitor/run_mdr_monitor.sh +++ b/market_data/md_recorder_monitor/run_mdr_monitor.sh @@ -35,7 +35,7 @@ fi # ConfigServer=cloud16.cvtt.vpn ConfigServer=cloud23.cvtt.vpn:6789 -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/apps/md/md_rec_monitor.py" Cmd="${Cmd} --config=http://${ConfigServer}/apps/md_rec_monitor" Cmd="${Cmd} --db=${Instance}" diff --git a/market_data/relative_liquidity/Dockerfile b/market_data/relative_liquidity/Dockerfile index 962d497..e6c8a92 100644 --- a/market_data/relative_liquidity/Dockerfile +++ b/market_data/relative_liquidity/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim WORKDIR / COPY docker_dev/relative_liquidity/requirements.txt / @@ -13,7 +13,7 @@ RUN mkdir /logs ENV PYTHONPATH=/ CMD [ \ - "python3.10", \ + "python3.12", \ "cvttpy/apps/md/rel_lqdt_server.py", \ "--port=5678", \ "--db_file=/app/data/rel_liquidity.db", \ diff --git a/trading/executor/Dockerfile b/trading/executor/Dockerfile index aefb1a3..0c0a934 100644 --- a/trading/executor/Dockerfile +++ b/trading/executor/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/trading/executor diff --git a/trading/executor/run_executor.sh b/trading/executor/run_executor.sh index c04b870..8fa9127 100755 --- a/trading/executor/run_executor.sh +++ b/trading/executor/run_executor.sh @@ -41,7 +41,7 @@ while getopts ":c:e:a:" opt; do esac done -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/apps/executor_app.py" Cmd="${Cmd} --config=http://${ConfigServer}/apps/cvtt_eqt_alpaca" Cmd="${Cmd} --credentials_file=/.creds" @@ -49,7 +49,7 @@ Cmd="${Cmd} --allow_dynamic_exch_inst" Cmd="${Cmd} --active_exchanges=${ActiveExchanges}" Cmd="${Cmd} --admin_port=${AdminPort}" Cmd="${Cmd} --log_file=/logs/%T.EXECUTOR_APP.log" -Cmd="${Cmd} --compress_log" +# Cmd="${Cmd} --compress_log" echo ${Cmd} eval ${Cmd} diff --git a/trading/quant/Dockerfile b/trading/quant/Dockerfile index e326e0b..2598cbe 100644 --- a/trading/quant/Dockerfile +++ b/trading/quant/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/trading/quant diff --git a/trading/quant/run_quant.sh b/trading/quant/run_quant.sh index 5a839a0..63a43e6 100755 --- a/trading/quant/run_quant.sh +++ b/trading/quant/run_quant.sh @@ -1,18 +1,5 @@ #!/bin/bash -# runs in container -#command=/home/cvtt/.pyenv/python3.10-venv/bin/python3 -# -u /home/cvtt/prod/cvttpy/apps/quant_app.py -# --config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca -# --active_exchanges=ALPACA_SNDBX-MDPORTAL -# --book=ALPACA_BK02 -# --strategy=DAILY_STOCK_001 -# --dynamic_instruments=ALPACA_SNDBX -# --admin_port=7224 -# --log_level=INFO -# --log_file=/home/cvtt/prod/logs/%%T.QUANT_APP.log -# # --debug_mode - # runs on host to start container usage() { echo -n "Usage: $0" @@ -67,7 +54,7 @@ if [ "${Book}" == "" ]; then usage fi -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/apps/quant_app.py" Cmd="${Cmd} --config=http://${ConfigServer}/apps/cvtt_eqt_alpaca" Cmd="${Cmd} --credentials_file=/.creds" diff --git a/trading/risk_mgr/Dockerfile b/trading/risk_mgr/Dockerfile index 8f1d237..234897c 100644 --- a/trading/risk_mgr/Dockerfile +++ b/trading/risk_mgr/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/trading/risk_mgr diff --git a/trading/risk_mgr/run_risk_mgr.sh b/trading/risk_mgr/run_risk_mgr.sh index c5b6c96..4c285ad 100755 --- a/trading/risk_mgr/run_risk_mgr.sh +++ b/trading/risk_mgr/run_risk_mgr.sh @@ -2,20 +2,6 @@ # runs in container -# [program:risk_manager_alpaca] -# directory=/home/cvtt/prod -# command=/home/cvtt/.pyenv/python3.10-venv/bin/python3 -# -u /home/cvtt/prod/cvttpy/apps/risk_manager_app.py -# --config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca -# --active_exchanges=ALPACA_SNDBX-MDPORTAL -# --book=ALPACA_BK02 -# # --redis_settings=cvtt-prod-02 -# --dynamic_instruments=ALPACA_SNDBX -# --admin_port=7223 -# --log_level=INFO -# --log_file=/home/cvtt/prod/logs/%%T.RISK_MGR_APP.log -# # --debug_mode - # runs on host to start container usage() { echo -n "Usage: $0" @@ -66,7 +52,7 @@ if [ "${Book}" == "" ]; then usage fi -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/apps/risk_manager_app.py" Cmd="${Cmd} --config=http://${ConfigServer}/apps/cvtt_eqt_alpaca" Cmd="${Cmd} --credentials_file=/.creds" diff --git a/trading/trader/Dockerfile b/trading/trader/Dockerfile index fdfe57a..4ec7f14 100644 --- a/trading/trader/Dockerfile +++ b/trading/trader/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/trading/trader diff --git a/trading/trader/run_trader.sh b/trading/trader/run_trader.sh index 80bf29b..6145c38 100755 --- a/trading/trader/run_trader.sh +++ b/trading/trader/run_trader.sh @@ -2,19 +2,6 @@ # runs in container # -------------------------------------------------------------------------- -#[program:trader_alpaca] -#directory=/home/cvtt/prod -#command=/home/cvtt/.pyenv/python3.10-venv/bin/python3 -# -u /home/cvtt/prod/cvttpy/apps/trader_app.py -# --config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpac -# --active_exchanges=ALPACA_SNDBX-MDPORTAL -# --book=ALPACA_BK02 -# -# --dynamic_instruments=ALPACA_SNDBX -# --algo=TRDALGO_MOOMOC_01 -# --admin_port=7226 -# --log_level=INFO -# --log_file=/home/cvtt/prod/logs/%%T.TRADER_APP.log # runs on host to start container usage() { @@ -73,7 +60,7 @@ if [ "${Book}" == "" ]; then usage fi -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/apps/trader_app.py" Cmd="${Cmd} --config=http://${ConfigServer}/apps/cvtt_eqt_alpaca" Cmd="${Cmd} --credentials_file=/.creds" diff --git a/trading/trading_recorder/Dockerfile b/trading/trading_recorder/Dockerfile index 9bc977c..8ca6efa 100644 --- a/trading/trading_recorder/Dockerfile +++ b/trading/trading_recorder/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ARG FROM_DIR=docker_dev/trading/trading_recorder diff --git a/trading/trading_recorder/run_trading_recorder.sh b/trading/trading_recorder/run_trading_recorder.sh index f2ee0b9..4b51d3c 100755 --- a/trading/trading_recorder/run_trading_recorder.sh +++ b/trading/trading_recorder/run_trading_recorder.sh @@ -1,24 +1,5 @@ #!/bin/bash -#[program:trading_rec_alpaca] -#directory=/home/cvtt/prod -#command=/home/cvtt/.pyenv/python3.10-venv/bin/python3 -# -u /home/cvtt/prod/cvttpy/apps/trade_recorder.py -# --config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca -# --active_exchanges=ALPACA_SNDBX-MDPORTAL -# --book=ALPACA_BK02 -# --dynamic_instruments=ALPACA_SNDBX -# --admin_port=7225 -# --log_level=INFO -# --log_file=/home/cvtt/prod/logs/%%T.TRADING_REC_APP.log -# # --debug_mode -#autostart=true -#autorestart=true -#startretries=1 -#startsecs=3 -#priority=2 -#user=cvtt - # runs on host to start container @@ -70,7 +51,7 @@ if [ "${Book}" == "" ]; then usage fi -Cmd="python3.10" +Cmd="python3.12" Cmd="${Cmd} cvttpy/apps/trader_app.py" Cmd="${Cmd} --config=http://${ConfigServer}/${Config}" Cmd="${Cmd} --credentials_file=/.creds"