From 487573a64b39d1f3d85a0e08a23437a6988020cd Mon Sep 17 00:00:00 2001 From: Cryptoval Trading Technologies Date: Mon, 2 Feb 2026 00:51:22 +0000 Subject: [PATCH] progress --- .env | 12 ++++++++++++ docker-compose.yml | 23 +++++++++++++++++++++++ retrofit/get_retrofit_dates.sh | 2 +- retrofit/retrofit_crypto.sh | 4 +++- retrofit/retrofit_equity.sh | 6 ++++-- retrofit/sim_crypto_retrofit.sh | 4 +++- retrofit/sim_equity_retrofit.sh | 4 +++- run.sh | 15 ++++++++------- 8 files changed, 57 insertions(+), 13 deletions(-) diff --git a/.env b/.env index 8d6b934..ec4ff9f 100644 --- a/.env +++ b/.env @@ -1,5 +1,17 @@ CREDS_FILE=/config/.creds +# ==================================== daily_ohlcv +OHLCV_IMAGE_VERSION=1.0.7 +OHLCV_CONFIG_FILE=http://cloud16.cvtt.vpn:6789/apps/md/ohlcv_recorder/archive_ohlcv +OHLCV_CONFIG_SERVICE=cloud16.cvtt.vpn:6789 +OHLCV_MD_DATE= + +OHLCV_RSYNC_TARGETS= +OHLCV_RSYNC_TARGETS="${OHLCV_RSYNC_TARGETS} cvtt@cloud21.cvtt.vpn:/works/cvtt/md_archive/crypto/olhcv" +OHLCV_RSYNC_TARGETS="${OHLCV_RSYNC_TARGETS} cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/crypto/olhcv" + +OHLCV_ADD_ARGS="--log_stdout" + # ==================================== daily_crypto_md CRYPTO_IMAGE_VERSION=0.0.6 CRYPTO_CONFIG_FILE=http://cloud16.cvtt.vpn:6789/apps/utils/mktdata/daily_md_crypto diff --git a/docker-compose.yml b/docker-compose.yml index 5ac5f3e..2a4a529 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,29 @@ name: daily_mktdata_services services: + daily_ohlcv: + image: cloud16.cvtt.vpn:5543/daily_ohlcv:${OHLCV_IMAGE_VERSION} + container_name: daily_ohlcv + user: ${CVTT_USER:-1001:1001} + pull_policy: always + restart: no + environment: + CONFIG_FILE: ${OHLCV_CONFIG_FILE} + CONFIG_SERVICE: ${OHLCV_CONFIG_SERVICE} + CREDS_FILE: ${CREDS_FILE} + + MD_DATE: ${OHLCV_MD_DATE} + RSYNC_TARGETS: ${OHLCV_RSYNC_TARGETS} + + LOG_FILE: /logs/%D.daily_ohlcv.log + + ADD_ARGS: ${OHLCV_ADD_ARGS:-} + volumes: + - ./config:/config + - ./logs:/logs + - ./config/identity/id_rsa:/home/cvtt/.ssh/id_rsa:ro + - ./config/identity/id_rsa.pub:/home/cvtt/.ssh/id_rsa.pub:ro + daily_crypto_cloud28: image: cloud16.cvtt.vpn:5543/daily_crypto_md:${CRYPTO_IMAGE_VERSION} container_name: ${CRYPTO_CONTAINER_NAME_PFX}.cloud28 diff --git a/retrofit/get_retrofit_dates.sh b/retrofit/get_retrofit_dates.sh index b6a38d1..8567556 100755 --- a/retrofit/get_retrofit_dates.sh +++ b/retrofit/get_retrofit_dates.sh @@ -92,7 +92,7 @@ get_equity_retrofit_dates() { local day_count=${3:-} if [[ -z "$host" || -z "$filename_glob" || -z "$day_count" ]]; then - echo "usage: get_equity_retrofit_dates " >&2 + echo "usage: get_equity_retrofit_dates " >&2 return 1 fi diff --git a/retrofit/retrofit_crypto.sh b/retrofit/retrofit_crypto.sh index beafb3b..2f5ec15 100755 --- a/retrofit/retrofit_crypto.sh +++ b/retrofit/retrofit_crypto.sh @@ -26,7 +26,9 @@ for dt in ${DATES}; do echo $dt Cmd="CRYPTO_MD_DATE=${dt}" Cmd+=" /usr/bin/docker compose" - Cmd+=" -f /works/docker/daily_mktdata/docker-compose.yml run --rm" + Cmd+=" -f /works/docker/daily_mktdata/docker-compose.yml" + Cmd+=" -p daily_crypto_${SourceHost}" + Cmd+=" run --rm" Cmd+=" daily_crypto_${SourceHost}" echo ${Cmd} diff --git a/retrofit/retrofit_equity.sh b/retrofit/retrofit_equity.sh index 6ad773b..8aabbd5 100755 --- a/retrofit/retrofit_equity.sh +++ b/retrofit/retrofit_equity.sh @@ -10,7 +10,7 @@ Source=cvtt@${MD_HOST:-cloud21.cvtt.vpn} FileGlob=${FILE_GLOB:-${DEFAULT_FGLOB}} BackDaysCount=${BACKDAYS_COUNT:-50} -Cmd="get_equity_retrofit_dates ${Source} /works/cvtt/md_archive/equity/alpaca_md/2025/N/NVDA ${FileGlob} ${BackDaysCount}" +Cmd="get_equity_retrofit_dates ${Source} /works/cvtt/md_archive/equity/alpaca_md/2025/N/NVDA/${FileGlob} ${BackDaysCount}" echo $Cmd DATES=$($Cmd) @@ -19,7 +19,9 @@ for dt in ${DATES}; do echo $dt Cmd="EQUITY_HBAR_DATE=${dt}" Cmd+=" /usr/bin/docker compose" - Cmd+=" -f /works/docker/daily_mktdata/docker-compose.yml run --rm" + Cmd+=" -f /works/docker/daily_mktdata/docker-compose.yml" + Cmd+=" -p daily_equity_hbar" + Cmd+=" run --rm" Cmd+=" daily_equity_hbar" diff --git a/retrofit/sim_crypto_retrofit.sh b/retrofit/sim_crypto_retrofit.sh index f2d40fc..b5e9fcd 100755 --- a/retrofit/sim_crypto_retrofit.sh +++ b/retrofit/sim_crypto_retrofit.sh @@ -21,7 +21,9 @@ DATES=$($Cmd) for dt in ${DATES}; do Cmd="DAILY_SIM_CRYPTO_DATE=${dt}" Cmd+=" /usr/bin/docker compose" - Cmd+=" -f /works/docker/daily_mktdata/docker-compose.yml run --rm" + Cmd+=" -f /works/docker/daily_mktdata/docker-compose.yml" + Cmd+=" -p daily_sim_crypto" # unique network name + Cmd+=" run --rm" Cmd+=" daily_sim_crypto" echo ${Cmd} diff --git a/retrofit/sim_equity_retrofit.sh b/retrofit/sim_equity_retrofit.sh index cda58ab..77a9c0c 100755 --- a/retrofit/sim_equity_retrofit.sh +++ b/retrofit/sim_equity_retrofit.sh @@ -20,7 +20,9 @@ DATES=$($Cmd) for dt in ${DATES}; do Cmd="DAILY_SIM_EQUITY_DATE=${dt}" Cmd+=" /usr/bin/docker compose" - Cmd+=" -f /works/docker/daily_mktdata/docker-compose.yml run --rm" + Cmd+=" -f /works/docker/daily_mktdata/docker-compose.yml" + Cmd+=" -p daily_sim_equity" + Cmd+=" run --rm" Cmd+=" daily_sim_equity" echo ${Cmd} diff --git a/run.sh b/run.sh index ed3ad07..0848d3b 100755 --- a/run.sh +++ b/run.sh @@ -5,14 +5,15 @@ set -euo pipefail COMPOSE_FILE="/works/docker/daily_mktdata/docker-compose.yml" PROJECT_DIR="/works/docker/daily_mktdata" PROJECT_NAME="daily_mktdata" -NETWORK_NAME="daily_mktdata_default" SERVICE="${1:?usage: $0 }" # Run the service as a one-off job and auto-remove container -exec docker compose \ - --project-name "${PROJECT_NAME}" \ - --project-directory "${PROJECT_DIR}" \ - -f "${COMPOSE_FILE}" \ - run --rm --no-deps \ - "${SERVICE}" +Cmd=(docker compose) +Cmd+=(--project-name "${PROJECT_NAME}") +Cmd+=(--project-directory "${PROJECT_DIR}") +Cmd+=(-f "${COMPOSE_FILE}") +Cmd+=(run --rm --no-deps) +Cmd+=("${SERVICE}") +echo "Running: ${Cmd[*]}" +exec "${Cmd[@]}" \ No newline at end of file