diff --git a/README.md b/README.md index 098a49b..bdef0e3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ - [Prerequisites](#prerequisites) - [Get Started](#get-started) - [Options](#options) - - [Component Versions](#component-versions-and-exposed-ports) + - [Component Versions and exposed ports](#component-versions-and-exposed-ports) - [All Options](#all-options) - [Docker Building Blocks](#docker-building-blocks) - [Aquarius](#aquarius) @@ -18,6 +18,7 @@ - [TheGraph](#thegraph) - [ocean-contracts](#ocean-contracts) - [Dashboard](#dashboard) + - [RBAC Server](#rbac-server) - [Contributing](#contributing) - [License](#license) @@ -62,19 +63,19 @@ The startup script comes with a set of options for customizing various things. The default versions are always a combination of component versions which are considered stable. -| Component name | Required by | Version | IP Address | Ports exposed | +| Component name | Required by | Version | IP Address | Ports exposed | | -------------- | ------------------ | --------------------------------- | --------------- | ------------- | | ganache | ocean-contracts | latest | 172.15.0.3 | 8545 -> 8545 | | ocean-contracts | | v0.6.4 | 172.15.0.14 | | -| Aquarius | | v2.2.12 | 172.15.0.5 | 5000 -> 5000 | +| Aquarius | | v2.2.12 | 172.15.0.5 | 5110 -> 5000 | | Elasticsearch | Aquarius | 6.8.3 | 172.15.0.6 | | | Provider | | v0.4.12 | 172.15.0.4 | 8030 -> 8030 | | Provider2 | | v0.4.12 | 172.15.0.7 | 8030 -> 8030 | -| RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 | -| GraphNode | | oceanprotocol/graph-node:latest | 172.15.0.15 | 9000 -> 8000 ,9001 -> 8001 , 9020 -> 8020, 9030 -> 8030, 9040 -> 8040 | -| Graphipfs | | ipfs/go-ipfs:v0.4.23 | 172.15.0.16 | 5001 -> 5001 | +| RBAC Server | | main | 172.15.0.8 | 3301 -> 3000 | +| GraphNode | | oceanprotocol/graph-node:latest | 172.15.0.15 | 9003 -> 8000 ,9004 -> 8001 , 9012 -> 8020, 9030 -> 8030, 9040 -> 8040 | +| Graphipfs | | ipfs/go-ipfs:v0.4.23 | 172.15.0.16 | 5040 -> 5001 | | Graphpgsql | | postgres | 172.15.0.7 | 5432 -> 5432 | -| Dashboard | | portainer/portainer | 172.15.0.25 | 9100 -> 9000 | +| Dashboard | | portainer/portainer | 172.15.0.25 | 9110 -> 9000 | | Redis | | bitnami/redis:latest | 172.15.0.18 | 6379 -> 6379 | @@ -125,7 +126,7 @@ This Building Block can be disabled by setting the `--no-aquarius` flag. | Hostname | External Port | Internal URL | Local URL | Description | | --------------- | ------------- | -------------------- | --------------------- | ----------------------------------------------------- | -| `aquarius` | `5000` | http://aquarius:5000 | http://localhost:5000 | [Aquarius](https://github.com/oceanprotocol/aquarius) | +| `aquarius` | `5110` | http://aquarius:5110 | http://localhost:5110 | [Aquarius](https://github.com/oceanprotocol/aquarius) | | `elasticsearch` | | | | The Elasticsearch used by Aquarius | ### Provider @@ -144,7 +145,7 @@ This Building Block can be disabled by setting the `--no-aquarius` flag. | Hostname | External Port | Internal URL | Local URL | Description | | ----------- | ------------- | --------------------- | --------------------- | --------------------------------------------------- | -| `graphnode` | `9000` | http://graphnode:9000 | http://localhost:9000 | | +| `graphnode` | `9003` | http://graphnode:9003 | http://localhost:9003 | | ### ocean-contracts @@ -169,13 +170,13 @@ This will start a `portainer` dashboard with the following admin credentials and | Hostname | External Port | Internal URL | Local URL | Description | | ----------- | ------------- | --------------------- | --------------------- | --------------------------------------------------- | -| `dashboard` | `9100` | http://dashboard:9100 | http://localhost:9100 | [Portainer](https://github.com/portainer/portainer) | +| `dashboard` | `9110` | http://dashboard:9110 | http://localhost:9110 | [Portainer](https://github.com/portainer/portainer) | ### RBAC Server | Hostname | External Port | Internal URL | Local URL | Description | | ----------- | ------------- | --------------------- | --------------------- | --------------------------------------------------- | -| `rbac` | `3000` | http://rbac:3000 | http://localhost:3000 | | +| `rbac` | `3301` | http://rbac:3301 | http://localhost:3301 | | The following addresses are preconfigured for testing: (first 10 addresses from the default mnemonic) diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index d3589c5..135c189 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -3,7 +3,7 @@ services: aquarius: image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-latest} ports: - - 5000:5000 + - 5110:5000 networks: backend: ipv4_address: 172.15.0.5 diff --git a/compose-files/dashboard.yml b/compose-files/dashboard.yml index c60f403..921e0c8 100644 --- a/compose-files/dashboard.yml +++ b/compose-files/dashboard.yml @@ -12,4 +12,4 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock ports: - - 9100:9000 + - 9110:9000 diff --git a/compose-files/provider.yml b/compose-files/provider.yml index a07da65..c2ca706 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -20,7 +20,7 @@ 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} + AQUARIUS_URL: ${AQUARIUS_URL:-http://172.15.0.5:5110} volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ - provider1db:/ocean-provider/db/ diff --git a/compose-files/provider2.yml b/compose-files/provider2.yml index 5720833..7a287f9 100644 --- a/compose-files/provider2.yml +++ b/compose-files/provider2.yml @@ -21,7 +21,7 @@ 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} + AQUARIUS_URL: ${AQUARIUS_URL:-http://172.15.0.5:5110} volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ - provider2db:/ocean-provider/db/ diff --git a/compose-files/rbac.yml b/compose-files/rbac.yml index d79809a..1a43873 100644 --- a/compose-files/rbac.yml +++ b/compose-files/rbac.yml @@ -3,11 +3,10 @@ services: rbac: image: oceanprotocol/rbac-server:${RBAC_VERSION:-next} ports: - - 3000:3000 + - 3301:3000 networks: backend: ipv4_address: 172.15.0.8 environment: DEFAULT_AUTH_SERVICE: "json" JSON_DATA: '[{"address":"0xe2DD09d719Da89e5a3D0F2549c7E24566e947260","id":"0","userRoles":["user","publisher","consumer"]},{"address":"0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e","id":"1","userRoles":["user","publisher","consumer"]},{"address":"0xA78deb2Fa79463945C247991075E2a0e98Ba7A09","id":"2","userRoles":["user","publisher","consumer"]},{"address":"0x02354A1F160A3fd7ac8b02ee91F04104440B28E7","id":"3","userRoles":["user","publisher","consumer"]},{"address":"0xe17D2A07EFD5b112F4d675ea2d122ddb145d117B","id":"4","userRoles":["user","publisher","consumer"]},{"address":"0xA32C84D2B44C041F3a56afC07a33f8AC5BF1A071","id":"5","userRoles":["user","publisher","consumer"]},{"address":"0xFF3fE9eb218EAe9ae1eF9cC6C4db238B770B65CC","id":"6","userRoles":["user"]},{"address":"0x529043886F21D9bc1AE0feDb751e34265a246e47","id":"7","userRoles":["consumer"]},{"address":"0xe08A1dAe983BC701D05E492DB80e0144f8f4b909","id":"8","userRoles":["publisher"]},{"address":"0xbcE5A3468386C64507D30136685A99cFD5603135","id":"9","userRoles":["consumer","publisher"]}]' - \ No newline at end of file diff --git a/compose-files/thegraph.yml b/compose-files/thegraph.yml index dde1735..96ed1b2 100644 --- a/compose-files/thegraph.yml +++ b/compose-files/thegraph.yml @@ -3,9 +3,9 @@ services: graph-node: image: oceanprotocol/graph-node:latest ports: - - '9000:8000' - - '9001:8001' - - '9020:8020' + - '9003:8000' + - '9004:8001' + - '9012:8020' - '9030:8030' - '9040:8040' networks: @@ -20,13 +20,13 @@ services: postgres_user: graph-node postgres_pass: let-me-in postgres_db: graph-node - ipfs: '172.15.0.16:5001' + ipfs: '172.15.0.16:5040' ethereum: 'barge:${NETWORK_RPC_URL}' RUST_LOG: info ipfs: image: ipfs/go-ipfs:v0.4.23 ports: - - '5001:5001' + - '5040:5001' networks: backend: ipv4_address: 172.15.0.16 diff --git a/start_ocean.sh b/start_ocean.sh index 089ec2f..5a6b2e1 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -84,9 +84,9 @@ export PROVIDER_PRIVATE_KEY=0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b export PROVIDER2_PRIVATE_KEY=0xc852b55146fd168ec3d392bbd70988c18463efa460a395dede376453aca1180e if [ ${IP} = "localhost" ]; then - export AQUARIUS_URI=http://172.15.0.5:5000 + export AQUARIUS_URI=http://172.15.0.5:5110 else - export AQUARIUS_URI=http://${IP}:5000 + export AQUARIUS_URI=http://${IP}:5110 fi #export OPERATOR_SERVICE_URL=http://127.0.0.1:8050