Merge branch 'master' into v2

This commit is contained in:
Matthias Kretschmann 2019-12-05 13:21:18 +01:00
commit a57cf1d0ac
Signed by: m
GPG Key ID: 606EEEF3C479A91F
2 changed files with 9 additions and 2 deletions

View File

@ -108,6 +108,7 @@ will use the default Docker image tags for Aquarius, Keeper Contracts and Common
| `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. |
| `--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-no-deploy` | Runs a node of the local `spree` network, without contract deployment. |
| `--local-duero-node` | Runs a local parity node and connects the node to the `duero` network. |
| `--local-nile-node` | Runs a local parity node and connects the node to the `nile` network. |
| `--local-pacific-node` | Runs a local parity node and connects the node to the `pacific` network (official Ocean network |

View File

@ -350,7 +350,6 @@ while :; do
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store_signing_node.yml/}"
export KEEPER_MNEMONIC=''
export KEEPER_NETWORK_NAME="development"
export KEEPER_DEPLOY_CONTRACTS="true"
printf $COLOR_Y'Starting with local Ganache node...\n\n'$COLOR_RESET
printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET
printf $COLOR_Y'Starting without Secret Store signing node...\n\n'$COLOR_RESET
@ -392,9 +391,16 @@ while :; do
# use this seed only on spree!
export KEEPER_MNEMONIC="taxi music thumb unique chat sand crew more leg another off lamp"
export KEEPER_NETWORK_NAME="spree"
export KEEPER_DEPLOY_CONTRACTS="true"
printf $COLOR_Y'Starting with local Spree node...\n\n'$COLOR_RESET
;;
--local-spree-no-deploy)
export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/spree_node.yml"
# use this seed only on spree!
export KEEPER_MNEMONIC="taxi music thumb unique chat sand crew more leg another off lamp"
export KEEPER_NETWORK_NAME="spree"
export KEEPER_DEPLOY_CONTRACTS="false"
printf $COLOR_Y'Starting with local Spree node, and keeping existing contracts (no deployment)...\n\n'$COLOR_RESET
;;
#################################################
# Cleaning switches
#################################################