Merge pull request #196 from oceanprotocol/update/containers

Update/containers
This commit is contained in:
Sebastian Gerske 2019-10-10 09:50:57 +02:00 committed by GitHub
commit 644f81d204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions

View File

@ -104,7 +104,7 @@ will use the default Docker image tags for Aquarius, Keeper Contracts and Common
| `--no-secret-store` | Start up Ocean without the `secret-store` Building Block. | | `--no-secret-store` | Start up Ocean without the `secret-store` Building Block. |
| `--no-faucet` | Start up Ocean without the `faucet` Building Block. | | `--no-faucet` | Start up Ocean without the `faucet` Building Block. |
| `--no-acl-contract` | Disables the configuration of secret store's ACL contract address | | `--no-acl-contract` | Disables the configuration of secret store's ACL contract address |
| `--no-dashboard` | Start up Ocean without the `dashboard` Building Block. | | `--no-dashboard` | Start up Ocean without the `dashboard` Building Block. |
| `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. | | `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. |
| `--local-ganache-node` | Runs a local `ganache` node. | | `--local-ganache-node` | Runs a local `ganache` node. |
| `--local-spree-node` | Runs a node of the local `spree` network. This is the default. | | `--local-spree-node` | Runs a node of the local `spree` network. This is the default. |
@ -127,8 +127,8 @@ By default it will start two containers (client & server). If Commons is running
This Building Block can be disabled by setting the `--no-commons` flag. This Building Block can be disabled by setting the `--no-commons` flag.
| Hostname | External Port | Internal URL | Local URL | Description | | Hostname | External Port | Internal URL | Local URL | Description |
|------------------|---------------|----------------------------|-----------------------|------------------------------------------------------------------ | |------------------|---------------|----------------------------|-----------------------|----------------------------------------------------------- |
| `commons-client` | `3000` | http://commons-client:3000 | http://localhost:3000 | [Commons Client](https://github.com/oceanprotocol/commons) | | `commons-client` | `3000` | http://commons-client:3000 | http://localhost:3000 | [Commons Client](https://github.com/oceanprotocol/commons) |
| `commons-server` | `4000` | http://commons-server:4000 | http://locahost:4000 | [Commons Server](https://github.com/oceanprotocol/commons) | | `commons-server` | `4000` | http://commons-server:4000 | http://locahost:4000 | [Commons Server](https://github.com/oceanprotocol/commons) |
@ -173,11 +173,11 @@ This node can be one of the following types (with the default being `spree`):
| Node | Description | | Node | Description |
| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `pacific` | Runs a local node of the Pacific Network and connects to the [Pacific network](https://docs.oceanprotocol.com/concepts/pacific-network/). |
| `ganache` | Runs a local [ganache-cli](https://github.com/trufflesuite/ganache-cli) node that is not persistent by default. The contracts from the desired `keeper-contracts` version will be deployed upon launch of this node. | | `ganache` | Runs a local [ganache-cli](https://github.com/trufflesuite/ganache-cli) node that is not persistent by default. The contracts from the desired `keeper-contracts` version will be deployed upon launch of this node. |
| `spree` | This is the default. Runs a local node of the Spree Network. See [Spree Network](#spree-network) for details. The contracts from the desired `keeper-contracts` version will be deployed upon launch of this node. | | `spree` | This is the default. Runs a local node of the Spree Network. See [Spree Network](#spree-network) for details. The contracts from the desired `keeper-contracts` version will be deployed upon launch of this node. |
| `duero` | Runs a local node of the Duero Network and connects to the [Duero Testnet](https://docs.oceanprotocol.com/concepts/testnets/#the-duero-testnet). | | `duero` | Runs a local node of the Duero Network and connects to the [Duero Testnet](https://docs.oceanprotocol.com/concepts/testnets/#the-duero-testnet). |
| `nile` | Runs a local node of the Nile Network and connects to the [Nile Testnet](https://docs.oceanprotocol.com/concepts/testnets/#nile-testnet). | | `nile` | Runs a local node of the Nile Network and connects to the [Nile Testnet](https://docs.oceanprotocol.com/concepts/testnets/#nile-testnet). |
| `pacific` | Runs a local node of the Pacific Network and connects to the [Pacific network](https://docs.oceanprotocol.com/concepts/pacific-network/). |
### Secret Store ### Secret Store

View File

@ -1,24 +1,24 @@
version: '3' version: '3'
services: services:
elasticsearch: elasticsearch:
image: elasticsearch:6.4.1 image: elasticsearch:6.8.3
networks: networks:
backend: backend:
ipv4_address: 172.15.0.11 ipv4_address: 172.15.0.11
environment: environment:
ES_JAVA_OPTS: "-Xms500m -Xmx500m" ES_JAVA_OPTS: "-Xms512m -Xmx512m"
MAX_MAP_COUNT: "64000" MAX_MAP_COUNT: "64000"
discovery.type: "single-node" discovery.type: "single-node"
aquarius: aquarius:
image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable}
ports: ports:
- 5000:5000 - 5000:5000
networks: networks:
backend: backend:
ipv4_address: 172.15.0.15 ipv4_address: 172.15.0.15
depends_on: depends_on:
- elasticsearch - elasticsearch
environment: environment:
DB_MODULE: ${DB_MODULE} DB_MODULE: ${DB_MODULE}
DB_HOSTNAME: ${DB_HOSTNAME} DB_HOSTNAME: ${DB_HOSTNAME}

View File

@ -21,7 +21,7 @@ export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.1}
export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v1.1.3} export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v1.1.3}
export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v1.1.3} export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v1.1.3}
export PARITY_IMAGE="parity/parity:v2.5.1" export PARITY_IMAGE="parity/parity:v2.5.7-stable"
export PROJECT_NAME="ocean" export PROJECT_NAME="ocean"
export FORCEPULL="false" export FORCEPULL="false"