From 210a4ef7c117c81fa573adc97c47de8e75903a1f Mon Sep 17 00:00:00 2001 From: nolash Date: Mon, 1 Feb 2021 21:36:14 +0100 Subject: [PATCH] Replace defaults --- docker-compose.yml | 101 +++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 49 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c0d45ed4..72320b54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -185,19 +185,19 @@ services: context: apps/ dockerfile: cic-eth/docker/Dockerfile environment: - ETH_PROVIDER: $ETH_PROVIDER - DATABASE_USER: $DATABASE_USER - DATABASE_HOST: $DATABASE_HOST - DATABASE_PORT: $DATABASE_PORT - DATABASE_PASSWORD: $DATABASE_PASSWORD - DATABASE_NAME: $DATABASE_NAME_CIC_ETH - DATABASE_ENGINE: $DATABASE_ENGINE - DATABASE_DRIVER: $DATABASE_DRIVER + ETH_PROVIDER: http://eth:8545 + DATABASE_USER: ${DATABASE_USER:-grassroots} + DATABASE_HOST: ${DATABASE_HOST:-postgres} + DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} + DATABASE_NAME: ${DATABASE_NAME_CIC_CACHE:-cic_cache} + DATABASE_PORT: ${DATABASE_PORT:-5432} + DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} + DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2} + CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - CIC_CHAIN_SPEC: $CIC_CHAIN_SPEC - BANCOR_DIR: $BANCOR_DIR - CELERY_BROKER_URL: $CELERY_BROKER_URL - CELERY_RESULT_URL: $CELERY_RESULT_URL + #BANCOR_DIR: $BANCOR_DIR + CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} + CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS depends_on: - eth @@ -221,19 +221,20 @@ services: context: apps/ dockerfile: cic-eth/docker/Dockerfile environment: - ETH_PROVIDER: $ETH_PROVIDER - DATABASE_USER: $DATABASE_USER - DATABASE_HOST: $DATABASE_HOST - DATABASE_PORT: $DATABASE_PORT - DATABASE_PASSWORD: $DATABASE_PASSWORD - DATABASE_NAME: $DATABASE_NAME_CIC_ETH - DATABASE_ENGINE: $DATABASE_ENGINE - DATABASE_DRIVER: $DATABASE_DRIVER + ETH_PROVIDER: http://eth:8545 + DATABASE_USER: ${DATABASE_USER:-grassroots} + DATABASE_HOST: ${DATABASE_HOST:-postgres} + DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} + DATABASE_NAME: ${DATABASE_NAME_CIC_CACHE:-cic_cache} + DATABASE_PORT: ${DATABASE_PORT:-5432} + DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} + DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2} + CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - CIC_CHAIN_SPEC: $CIC_CHAIN_SPEC - BANCOR_DIR: $BANCOR_DIR - CELERY_BROKER_URL: $CELERY_BROKER_URL - CELERY_RESULT_URL: $CELERY_RESULT_URL + #BANCOR_DIR: $BANCOR_DIR + CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} + CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} + TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS depends_on: - eth - postgres @@ -256,19 +257,21 @@ services: context: apps/ dockerfile: cic-eth/docker/Dockerfile environment: - ETH_PROVIDER: $ETH_PROVIDER - DATABASE_USER: $DATABASE_USER - DATABASE_HOST: $DATABASE_HOST - DATABASE_PORT: $DATABASE_PORT - DATABASE_PASSWORD: $DATABASE_PASSWORD - DATABASE_NAME: $DATABASE_NAME_CIC_ETH - DATABASE_ENGINE: $DATABASE_ENGINE - DATABASE_DRIVER: $DATABASE_DRIVER + ETH_PROVIDER: http://eth:8545 + DATABASE_USER: ${DATABASE_USER:-grassroots} + DATABASE_HOST: ${DATABASE_HOST:-postgres} + DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} + DATABASE_NAME: ${DATABASE_NAME_CIC_CACHE:-cic_cache} + DATABASE_PORT: ${DATABASE_PORT:-5432} + DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} + DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2} + CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - CIC_CHAIN_SPEC: $CIC_CHAIN_SPEC - BANCOR_DIR: $BANCOR_DIR - CELERY_BROKER_URL: $CELERY_BROKER_URL - CELERY_RESULT_URL: $CELERY_RESULT_URL + #BANCOR_DIR: $BANCOR_DIR + CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} + CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} + TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS + depends_on: - eth - postgres @@ -292,20 +295,20 @@ services: context: apps/ dockerfile: cic-eth/docker/Dockerfile environment: - ETH_PROVIDER: $ETH_PROVIDER - DATABASE_USER: $DATABASE_USER - DATABASE_HOST: $DATABASE_HOST - DATABASE_PORT: $DATABASE_PORT - DATABASE_PASSWORD: $DATABASE_PASSWORD - DATABASE_NAME: $DATABASE_NAME_CIC_ETH - DATABASE_ENGINE: $DATABASE_ENGINE - DATABASE_DRIVER: $DATABASE_DRIVER + ETH_PROVIDER: http://eth:8545 + DATABASE_USER: ${DATABASE_USER:-grassroots} + DATABASE_HOST: ${DATABASE_HOST:-postgres} + DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} + DATABASE_NAME: ${DATABASE_NAME_CIC_CACHE:-cic_cache} + DATABASE_PORT: ${DATABASE_PORT:-5432} + DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} + DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2} + CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - CIC_CHAIN_SPEC: $CIC_CHAIN_SPEC - CIC_TX_RETRY_DELAY: $CIC_TX_RETRY_DELAY - BANCOR_DIR: $BANCOR_DIR - CELERY_BROKER_URL: $CELERY_BROKER_URL - CELERY_RESULT_URL: $CELERY_RESULT_URL + #BANCOR_DIR: $BANCOR_DIR + CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} + CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} + TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS depends_on: - eth - postgres