fx fix
This commit is contained in:
@@ -32,6 +32,11 @@ services:
|
||||
MONGO_HOSTS_2: ${MONGO_HOSTS_2}
|
||||
MONGO_PORTS_2: ${MONGO_PORTS_2}
|
||||
FX_INGESTOR_METRICS_PORT: ${FX_INGESTOR_METRICS_PORT}
|
||||
NATS_URL: ${FX_NATS_URL}
|
||||
NATS_HOST: ${NATS_HOST}
|
||||
NATS_PORT: ${NATS_PORT}
|
||||
NATS_USER: ${NATS_USER}
|
||||
NATS_PASSWORD: ${NATS_PASSWORD}
|
||||
command: ["--config.file", "/app/config.yml"]
|
||||
ports:
|
||||
- "0.0.0.0:${FX_INGESTOR_METRICS_PORT}:${FX_INGESTOR_METRICS_PORT}"
|
||||
|
||||
@@ -23,7 +23,7 @@ case "$SERVICE" in
|
||||
COMPOSE_PROJECT="${FX_INGESTOR_COMPOSE_PROJECT:-sendico-fx-ingestor}"
|
||||
COMPOSE_FILE="fx_ingestor.yml"
|
||||
SERVICE_NAMES="${FX_INGESTOR_SERVICE_NAME:-sendico_fx_ingestor}"
|
||||
REQUIRED_SECRETS=(FX_MONGO_USER FX_MONGO_PASSWORD)
|
||||
REQUIRED_SECRETS=(FX_MONGO_USER FX_MONGO_PASSWORD NATS_USER NATS_PASSWORD FX_NATS_URL)
|
||||
;;
|
||||
oracle)
|
||||
: "${FX_ORACLE_DIR:?missing FX_ORACLE_DIR}"
|
||||
|
||||
@@ -50,7 +50,14 @@ load_env_file ./.env.version
|
||||
|
||||
FX_MONGO_SECRET_PATH="${FX_MONGO_SECRET_PATH:?missing FX_MONGO_SECRET_PATH}"
|
||||
FX_DEPLOY_TARGET="${FX_DEPLOY_TARGET:?missing FX_DEPLOY_TARGET}"
|
||||
FX_NEEDS_NATS="${FX_NEEDS_NATS:-false}"
|
||||
FX_NEEDS_NATS="${FX_NEEDS_NATS:-}"
|
||||
|
||||
if [ -z "${FX_NEEDS_NATS}" ]; then
|
||||
case "${FX_DEPLOY_TARGET}" in
|
||||
ingestor|oracle) FX_NEEDS_NATS=true ;;
|
||||
*) FX_NEEDS_NATS=false ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
export FX_MONGO_USER="$(./ci/vlt kv_get kv "${FX_MONGO_SECRET_PATH}" user)"
|
||||
export FX_MONGO_PASSWORD="$(./ci/vlt kv_get kv "${FX_MONGO_SECRET_PATH}" password)"
|
||||
|
||||
Reference in New Issue
Block a user