Merge branch 'master' into feature/faucet

This commit is contained in:
Matthias Kretschmann 2019-09-17 16:40:24 +02:00 committed by GitHub
commit 15cac395ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions

View File

@ -15,6 +15,7 @@
- [Pleuston](#pleuston)
- [Aquarius](#aquarius)
- [Brizo](#brizo)
- [Events Handler](#events-handler)
- [Keeper Node](#keeper-node)
- [Secret Store](#secret-store)
- [Faucet](#faucet)
@ -65,7 +66,7 @@ The default versions are always a combination of component versions which are co
| Aquarius | Brizo | Events Handler | Keeper | Pleuston | Faucet |
| -------- | --------- | -------------- | --------- | -------- | -------- |
| `v0.3.8` | `v0.4.2` | `v0.1.2` | `v0.11.1` | `v0.5.1` | `v0.3.1` |
| `v0.3.8` | `v0.4.4` | `v0.1.2` | `v0.11.1` | `v0.5.1` | `v0.3.1` |
You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo.
@ -81,7 +82,7 @@ You can override the Docker image tag used for a particular component by setting
For example:
```bash
export BRIZO_VERSION=v0.2.1
export BRIZO_VERSION=v0.4.4
./start_ocean.sh
```
@ -97,7 +98,7 @@ will use the default Docker image tags for Aquarius, Keeper Contracts and Pleust
| `--no-pleuston` | Start up Ocean without the `pleuston` Building Block. Helpful for development on `pleuston`. |
| `--no-aquarius` | Start up Ocean without the `aquarius` Building Block. |
| `--no-brizo` | Start up Ocean without the `brizo` Building Block. |
| `--no-events-handler` | Start up Ocean without the `events-handler` Building Block. |
| `--no-events-handler` | Start up Ocean without the `events-handler` Building Block. |
| `--no-secret-store` | Start up Ocean without the `secret-store` Building Block. |
| `--no-faucet` | Start up Ocean without the `faucet` Building Block. |
| `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. |
@ -151,9 +152,9 @@ By default it will start one container. This Building Block can be disabled by s
By default it will start one container. This Building Block can be disabled by setting the `--no-events-handler` flag.
| Hostname | External Port | Internal URL | Local URL | Description |
| ----------------- | ------------- | ----------------- | --------------------- | -------------------------------------------------------------------- |
| `events-handler` | | | | [Events-handler](https://github.com/oceanprotocol/events-handler-py) |
| Hostname | External Port | Internal URL | Local URL | Description |
| ---------------- | ------------- | ------------ | --------- | ----------------------------------------------------------------- |
| `events-handler` | | | | [Events-handler](https://github.com/oceanprotocol/events-handler) |
### Keeper Node

View File

@ -1,7 +1,7 @@
version: '3'
services:
events-handler:
image: oceanprotocol/events-handler-py:$EVENTS_HANDLER_VERSION
image: oceanprotocol/events-handler:$EVENTS_HANDLER_VERSION
networks:
backend:
ipv4_address: 172.15.0.22

View File

@ -14,7 +14,7 @@ COMPOSE_DIR="${DIR}/compose-files"
# Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston
export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8}
export BRIZO_VERSION=${BRIZO_VERSION:-v0.4.2}
export BRIZO_VERSION=${BRIZO_VERSION:-v0.4.4}
export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.1.2}
export KEEPER_VERSION=${KEEPER_VERSION:-v0.11.1}
export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1}
@ -172,6 +172,13 @@ DOCKER_COMPOSE_EXTRA_OPTS="${DOCKER_COMPOSE_EXTRA_OPTS:-}"
while :; do
case $1 in
#################################################
# Log level
#################################################
--debug)
export BRIZO_LOG_LEVEL="DEBUG"
export EVENTS_HANDLER_LOG_LEVEL="DEBUG"
;;
#################################################
# Disable color
#################################################
--no-ansi)
@ -204,7 +211,7 @@ while :; do
;;
--no-events-handler)
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/events_handler.yml/}"
printf $COLOR_Y'Starting without EventsHandler...\n\n'$COLOR_RESET
printf $COLOR_Y'Starting without Events Handler...\n\n'$COLOR_RESET
;;
--no-brizo)
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/brizo.yml/}"