diff --git a/microservices/.env b/microservices/.env index 412fd15..1bf0a5d 100644 --- a/microservices/.env +++ b/microservices/.env @@ -3,16 +3,21 @@ 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_CONFIG_FILE=config_musvc.cfg +# PXER_CREDS_FILE=.creds +PXER_LOG_FILE=%T.ac_gateway.log +PXER_ADD_ARGS= diff --git a/microservices/docker-compose.yml b/microservices/docker-compose.yml index 9ce5e26..b99e474 100644 --- a/microservices/docker-compose.yml +++ b/microservices/docker-compose.yml @@ -1,5 +1,23 @@ # CVTT Microservices services: + 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} + PXER_CONFIG_FILE: ${PXER_CONFIG_FILE:-cvtt_musvc.cfg} + PXER_CREDS_FILE: ${PXER_CREDS_FILE:-.creds} + PXER_LOG_FILE: ${PXER_LOG_FILE:-%T.pricer.log} + PXER_ADD_ARGS: ${PXER_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 @@ -8,7 +26,7 @@ services: 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_CREDS_FILE: ${MDGW_CREDS_FILE:-.creds} MDGW_LOG_FILE: ${MDGW_LOG_FILE:-%T.md_gateway.log} MDGW_ADD_ARGS: ${MDGW_ADD_ARGS:-} volumes: @@ -25,7 +43,7 @@ services: 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_CREDS_FILE: ${OEGW_CREDS_FILE:-.creds} OEGW_LOG_FILE: ${OEGW_LOG_FILE:-%T.oe_gateway.log} OEGW_ADD_ARGS: ${OEGW_ADD_ARGS:-} volumes: @@ -42,7 +60,7 @@ services: 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_CREDS_FILE: ${ACGW_CREDS_FILE:-.creds} ACGW_LOG_FILE: ${ACGW_LOG_FILE:-%T.ac_gateway.log} ACGW_ADD_ARGS: ${ACGW_ADD_ARGS:-} volumes: diff --git a/microservices/pricer/entrypoint.sh b/microservices/pricer/entrypoint.sh index 69bbb12..bc267e1 100755 --- a/microservices/pricer/entrypoint.sh +++ b/microservices/pricer/entrypoint.sh @@ -6,6 +6,7 @@ LogDir=/logs Cmd="python3.12" Cmd+=" cvttpy/apps/microservices/pricer/pricer.py" Cmd+=" --config=${ConfigDir}/${PXER_CONFIG_FILE:-cvtt_musvc.cfg}" +Cmd+=" --credentials_file=${ConfigDir}/${PXER_CREDS_FILE:-.creds}" Cmd+=" --log_file=${LogDir}/${PXER_LOG_FILE:-%T.pricer.log}" Cmd+=" ${PXER_ADD_ARGS}" echo ${Cmd}