Merge branch 'feature/did-datatoken' into v3

# Conflicts:
#	start_ocean.sh
This commit is contained in:
ssallam 2020-09-23 13:52:04 +02:00
commit f5691db303
2 changed files with 3 additions and 2 deletions

View File

@ -24,5 +24,6 @@ services:
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,8 +29,8 @@ COMPOSE_DIR="${DIR}/compose-files"
# Default versions of Aquarius, Provider
export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3}
export PROVIDER_VERSION=${PROVIDER_VERSION:-latest}
export CONTRACTS_VERSION=${CONTRACTS_VERSION:-latest}
export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0}
export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.4.4}
export PROJECT_NAME="ocean"
export FORCEPULL="false"