1
0
mirror of https://github.com/oceanprotocol/barge.git synced 2024-11-22 17:50:13 +01:00

Merge branch 'feature/new-brizo-support' into feature/new-brizo

# Conflicts:
#	compose-files/brizo.yml
This commit is contained in:
ssallam 2019-08-28 14:55:51 +02:00
commit e534c815fb
3 changed files with 29 additions and 0 deletions

View File

@ -19,5 +19,7 @@ services:
SECRET_STORE_URL: ${SECRET_STORE_URL} SECRET_STORE_URL: ${SECRET_STORE_URL}
PARITY_ADDRESS: ${PUBLISHER_ADDRESS} PARITY_ADDRESS: ${PUBLISHER_ADDRESS}
PARITY_PASSWORD: ${PUBLISHER_PASSWORD} PARITY_PASSWORD: ${PUBLISHER_PASSWORD}
PARITY_KEYFILE: "/parity-data/keys/validator0.json"
volumes: volumes:
- ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro
- ../networks/spree/authorities/:/parity-data/keys

View File

@ -0,0 +1,20 @@
version: '3'
services:
events-handler:
image: oceanprotocol/ocean-events-handler:v0.1.0
networks:
backend:
ipv4_address: 172.15.0.22
depends_on:
- keeper-node
environment:
KEEPER_URL: ${KEEPER_RPC_URL}
PARITY_URL: ${KEEPER_RPC_URL}
SECRET_STORE_URL: "http://secret-store:12001"
PARITY_ADDRESS: "0x00bd138abd70e2f00903268f3db08f2d25677c9e"
PARITY_PASSWORD: "node0"
PARITY_KEYFILE: "/parity-data/keys/validator0.json"
LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS}
volumes:
- ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro
- ../networks/spree/authorities/:/parity-data/keys

View File

@ -15,6 +15,7 @@ COMPOSE_DIR="${DIR}/compose-files"
# Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston # Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston
export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8} export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8}
export BRIZO_VERSION=${BRIZO_VERSION:-v0.3.14} export BRIZO_VERSION=${BRIZO_VERSION:-v0.3.14}
export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:v0.1.0}
export KEEPER_VERSION=${KEEPER_VERSION:-v0.10.3} export KEEPER_VERSION=${KEEPER_VERSION:-v0.10.3}
export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1}
export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6} export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6}
@ -155,6 +156,7 @@ COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/events_handler.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store_signing_node.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store_signing_node.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/faucet.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/faucet.yml"
@ -176,6 +178,7 @@ while :; do
--latest) --latest)
export AQUARIUS_VERSION="latest" export AQUARIUS_VERSION="latest"
export BRIZO_VERSION="latest" export BRIZO_VERSION="latest"
export EVENTS_HANDLER_VERSION="latest"
export KEEPER_VERSION="latest" export KEEPER_VERSION="latest"
# TODO: Change label on Docker to refer `latest` to `master` # TODO: Change label on Docker to refer `latest` to `master`
export PLEUSTON_VERSION="master" export PLEUSTON_VERSION="master"
@ -193,6 +196,10 @@ while :; do
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/pleuston.yml/}" COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/pleuston.yml/}"
printf $COLOR_Y'Starting without Pleuston...\n\n'$COLOR_RESET printf $COLOR_Y'Starting without Pleuston...\n\n'$COLOR_RESET
;; ;;
--no-events-handler)
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/events_handler.yml/}"
printf $COLOR_Y'Starting without EventsHandler...\n\n'$COLOR_RESET
;;
--no-brizo) --no-brizo)
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/brizo.yml/}" COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/brizo.yml/}"
printf $COLOR_Y'Starting without Brizo...\n\n'$COLOR_RESET printf $COLOR_Y'Starting without Brizo...\n\n'$COLOR_RESET