1
0
mirror of https://github.com/oceanprotocol/barge.git synced 2024-12-02 05:57:21 +01:00

Merge pull request #154 from oceanprotocol/fix/version-switches

Fix version switches, remove --stable flag
This commit is contained in:
Matthias Kretschmann 2019-06-05 14:44:47 +02:00 committed by GitHub
commit 98088b01b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 18 deletions

View File

@ -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`).
<img width="535" alt="Welcome to Ocean Protocol" src="Welcome_to_Ocean_Protocol.png">
<img width="486" alt="Welcome to Ocean Protocol" src="Welcome_to_Ocean_Protocol.png">
## 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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 214 KiB

View File

@ -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