diff --git a/README.md b/README.md index 716381c..24b481b 100644 --- a/README.md +++ b/README.md @@ -55,11 +55,9 @@ cd barge ./start_ocean.sh ``` -with no `--latest` or `--stable` option. -That will run the current default versions of Aquarius, Brizo, Pleuston and Keeper Contracts (listed in the table below). -It will also run a local Spree network (i.e. `--local-spree-node`). +That will run the current default versions of Aquarius, Brizo, Pleuston and Keeper Contracts (listed in the table below). It will also run a local Spree network (i.e. `--local-spree-node`). -Welcome to Ocean Protocol +Welcome to Ocean Protocol ## Script Options @@ -67,11 +65,12 @@ Options that set the versions (Docker image tags) of Aquarius, Brizo, Keeper Con Option | Aquarius | Brizo | Keeper | Pleuston | ------------|-----------|----------|----------|----------| -`--latest` | `latest` | `latest` | `latest` | `latest` | -`--stable` | `stable` | `stable` | `stable` | `stable` | (Default) | `v0.2.2` | `v0.3.1` | `v0.9.0` | `v0.3.0` | +`--latest` | `latest` | `latest` | `latest` | `latest` | -Note: The `latest` Docker image tag derives from the `develop` branch of the component's Git repo and the `stable` Docker image tag derives from the `master` branch. +Default is always a combination of component versions which are considered stable. + +The `latest` Docker image tag derives from the `develop` branch of the component's Git repo. You can override the Docker image tag used for a particular component by setting its associated environment variable (`AQUARIUS_VERSION`, `BRIZO_VERSION`, `KEEPER_VERSION` or `PLEUSTON_VERSION`) before calling `start_ocean.sh`. For example: @@ -82,6 +81,8 @@ export BRIZO_VERSION=v0.2.1 will use the default Docker image tags for Aquarius, Keeper Contracts and Pleuston, but `v0.2.1` for Brizo. +Note: If you use the `--latest` option, then the `latest` Docker images will be used _regardless of whether you set any environment variables beforehand._ + Other `start_ocean.sh` options: Option | Description diff --git a/Welcome_to_Ocean_Protocol.png b/Welcome_to_Ocean_Protocol.png index 117263f..4f06027 100644 Binary files a/Welcome_to_Ocean_Protocol.png and b/Welcome_to_Ocean_Protocol.png differ diff --git a/start_ocean.sh b/start_ocean.sh index 6abf9b3..c7b6e7e 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -138,19 +138,12 @@ while :; do # Version switches ################################################# --latest) - export AQUARIUS_VERSION=${AQUARIUS_VERSION:-latest} - export BRIZO_VERSION=${BRIZO_VERSION:-latest} - export KEEPER_VERSION=${KEEPER_VERSION:-latest} - export PLEUSTON_VERSION=${PLEUSTON_VERSION:-latest} + export AQUARIUS_VERSION="latest" + export BRIZO_VERSION="latest" + export KEEPER_VERSION="latest" + export PLEUSTON_VERSION="latest" printf $COLOR_Y'Switched to latest components...\n\n'$COLOR_RESET ;; - --stable) - export AQUARIUS_VERSION=${AQUARIUS_VERSION:-stable} - export BRIZO_VERSION=${BRIZO_VERSION:-stable} - export KEEPER_VERSION=${KEEPER_VERSION:-stable} - export PLEUSTON_VERSION=${PLEUSTON_VERSION:-stable} - printf $COLOR_Y'Switched to stable components...\n\n'$COLOR_RESET - ;; --force-pull) export FORCEPULL="true" printf $COLOR_Y'Pulling the latest revision of the used Docker images...\n\n'$COLOR_RESET