From 9b45e8e31e493e3b317eff0501b40cc50db66e73 Mon Sep 17 00:00:00 2001 From: Louis Holbrook Date: Mon, 8 Feb 2021 18:55:20 +0000 Subject: [PATCH] Environment revisions --- docker-compose.yml | 73 ++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 54 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 57c6bd73..89f6d929 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -190,10 +190,7 @@ services: context: apps/ dockerfile: cic-eth/docker/Dockerfile environment: - CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER ETH_PROVIDER: http://eth:8545 - ETH_ABI_DIR: ${ETH_ABI_DIR:-/usr/local/share/cic/solidity/abi} DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} @@ -201,14 +198,12 @@ services: DATABASE_PORT: ${DATABASE_PORT:-5432} DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2} - PGPASSWORD: ${DATABASE_PASSWORD:-tralala} CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} - BANCOR_DIR: ${BANCOR_DIR:-/usr/local/share/cic/bancor} + CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS + #BANCOR_DIR: $BANCOR_DIR CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} - SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc} - SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} - ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} + TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS depends_on: - eth - postgres @@ -231,10 +226,7 @@ services: context: apps/ dockerfile: cic-eth/docker/Dockerfile environment: - CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER ETH_PROVIDER: http://eth:8545 - ETH_ABI_DIR: ${ETH_ABI_DIR:-/usr/local/share/cic/solidity/abi} DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} @@ -242,14 +234,12 @@ services: DATABASE_PORT: ${DATABASE_PORT:-5432} DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2} - PGPASSWORD: ${DATABASE_PASSWORD:-tralala} CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} - BANCOR_DIR: ${BANCOR_DIR:-/usr/local/share/cic/bancor} + CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS + #BANCOR_DIR: $BANCOR_DIR CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} - SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc} - SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} - ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} + TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS depends_on: - eth - postgres @@ -272,10 +262,7 @@ services: context: apps/ dockerfile: cic-eth/docker/Dockerfile environment: - CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER ETH_PROVIDER: http://eth:8545 - ETH_ABI_DIR: ${ETH_ABI_DIR:-/usr/local/share/cic/solidity/abi} DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} @@ -283,14 +270,13 @@ services: DATABASE_PORT: ${DATABASE_PORT:-5432} DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2} - PGPASSWORD: ${DATABASE_PASSWORD:-tralala} CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} - BANCOR_DIR: ${BANCOR_DIR:-/usr/local/share/cic/bancor} + CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS + #BANCOR_DIR: $BANCOR_DIR CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} - SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc} - SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} - ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} + TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS + depends_on: - eth - postgres @@ -314,10 +300,7 @@ services: context: apps/ dockerfile: cic-eth/docker/Dockerfile environment: - CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER ETH_PROVIDER: http://eth:8545 - ETH_ABI_DIR: ${ETH_ABI_DIR:-/usr/local/share/cic/solidity/abi} DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} @@ -325,15 +308,12 @@ services: DATABASE_PORT: ${DATABASE_PORT:-5432} DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2} - PGPASSWORD: ${DATABASE_PASSWORD:-tralala} CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} - BANCOR_DIR: ${BANCOR_DIR:-/usr/local/share/cic/bancor} + CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS + #BANCOR_DIR: $BANCOR_DIR CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} - SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc} - SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} - ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} - CIC_TX_RETRY_DELAY: ${CIC_TX_RETRY_DELAY:-30} + TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS depends_on: - eth - postgres @@ -354,28 +334,13 @@ services: cic-eth-server: build: - context: apps/ - dockerfile: cic-eth/docker/Dockerfile + context: apps/ + dockerfile: cic-eth/docker/Dockerfile environment: - CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER - ETH_PROVIDER: http://eth:8545 - ETH_ABI_DIR: ${ETH_ABI_DIR:-/usr/local/share/cic/solidity/abi} - 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} - PGPASSWORD: ${DATABASE_PASSWORD:-tralala} - CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-Bloxberg:8996} - BANCOR_DIR: ${BANCOR_DIR:-/usr/local/share/cic/bancor} - CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} - CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} - SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc} - SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} - ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} + CIC_CHAIN_SPEC: $CIC_CHAIN_SPEC + CELERY_BROKER_URL: $CELERY_BROKER_URL + CELERY_RESULT_URL: $CELERY_RESULT_URL + SERVER_PORT: 80 depends_on: - eth - postgres