1
0
mirror of https://github.com/oceanprotocol/barge.git synced 2024-11-24 19:10:17 +01:00

Merge pull request #229 from oceanprotocol/feature/compute_nextv

Feature/compute nextv
This commit is contained in:
Alex Coseru 2021-02-18 14:10:54 +02:00 committed by GitHub
commit 3694c7d28b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 8 deletions

View File

@ -13,11 +13,7 @@ services:
ARTIFACTS_PATH: "/ocean-contracts/artifacts"
NETWORK_URL: ${NETWORK_RPC_URL}
PARITY_URL: ${NETWORK_RPC_URL}
PROVIDER_KEY: ${PROVIDER_PRIVATE_KEY}
PROVIDER_PRIVATE_KEY: ${PROVIDER_PRIVATE_KEY}
PROVIDER_ADDRESS: ${PROVIDER_ADDRESS}
PROVIDER_PASSWORD: ${PROVIDER_PASSWORD}
PROVIDER_ENCRYPTED_KEY: ${PROVIDER_ENCRYPTED_KEY}
LOG_LEVEL: ${PROVIDER_LOG_LEVEL}
OCEAN_PROVIDER_URL: 'http://0.0.0.0:8030'
OCEAN_PROVIDER_WORKERS: ${PROVIDER_WORKERS}

View File

@ -0,0 +1,25 @@
version: '3'
services:
provider2:
image: oceanprotocol/provider-py:${PROVIDER_VERSION:-latest}
ports:
- 8031:8030
networks:
backend:
ipv4_address: 172.15.0.7
depends_on:
- ocean-contracts
environment:
ARTIFACTS_PATH: "/ocean-contracts/artifacts"
NETWORK_URL: ${NETWORK_RPC_URL}
PARITY_URL: ${NETWORK_RPC_URL}
PROVIDER_PRIVATE_KEY: ${PROVIDER2_PRIVATE_KEY}
LOG_LEVEL: ${PROVIDER_LOG_LEVEL}
OCEAN_PROVIDER_URL: 'http://0.0.0.0:8030'
OCEAN_PROVIDER_WORKERS: ${PROVIDER_WORKERS}
IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY}
OCEAN_PROVIDER_TIMEOUT: '9000'
OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL}
AQUARIUS_URL: ${AQUARIUS_URL:-http://172.15.0.5:5000}
volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/

View File

@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files"
# Default versions of Aquarius, Provider
export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v2.1.13}
export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.4.6}
export PROVIDER_VERSION=${PROVIDER_VERSION:-latest}
export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.9}
export PROJECT_NAME="ocean"
export FORCEPULL="false"
@ -75,10 +75,11 @@ CHECK_ELASTIC_VM_COUNT=true
#Provider
export PROVIDER_LOG_LEVEL=INFO
export PROVIDER_WORKERS=1
export PROVIDER_LOG_LEVEL=${PROVIDER_LOG_LEVEL:-INFO}
export PROVIDER_WORKERS=10
export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com
export PROVIDER_PRIVATE_KEY=0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b9a93fea8c3d215
export PROVIDER2_PRIVATE_KEY=0xc852b55146fd168ec3d392bbd70988c18463efa460a395dede376453aca1180e
if [ ${IP} = "localhost" ]; then
export AQUARIUS_URI=http://172.15.0.5:5000
@ -87,7 +88,7 @@ else
fi
#export OPERATOR_SERVICE_URL=http://127.0.0.1:8050
export OPERATOR_SERVICE_URL=https://operator-api.operator.dev-ocean.com
export OPERATOR_SERVICE_URL=https://nextv.operator.dev-ocean.com/
# Add aquarius to /etc/hosts
@ -186,6 +187,10 @@ while :; do
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}"
printf $COLOR_Y'Starting without Provider...\n\n'$COLOR_RESET
;;
--with-provider2)
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/provider2.yml"
printf $COLOR_Y'Starting with a 2nd Provider...\n\n'$COLOR_RESET
;;
--no-ganache)
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ganache.yml/}"
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ocean_contracts.yml/}"