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

Merge pull request #102 from oceanprotocol/fix/aquarius_url

Browse Source 
Fix/aquarius url
This commit is contained in:
Aitor 2019-01-24 15:10:21 +01:00 committed by GitHub
commit def6075864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose-files/secret_store.yml
View File

@ -1,7 +1,7 @@
version: '2.1' version: '2.1'
services: services:
secret-store: secret-store:
image: oceanprotocol/parity-ethereum:acl_docker image: oceanprotocol/parity-ethereum:master
entrypoint: /entrypoint.sh entrypoint: /entrypoint.sh
environment: environment:
CONFIGURE_ACL: "${CONFIGURE_ACL}" CONFIGURE_ACL: "${CONFIGURE_ACL}"

32
start_ocean.sh
View File

@ -8,7 +8,7 @@ DIR="${DIR/ /\\ }"
COMPOSE_DIR="${DIR}/compose-files" COMPOSE_DIR="${DIR}/compose-files"
export PROJECT_NAME="ocean" export PROJECT_NAME="ocean"
export forcepull="false" export FORCEPULL="false"
# default to latest versions # default to latest versions
export OCEAN_VERSION=stable export OCEAN_VERSION=stable
@ -62,9 +62,18 @@ COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml"
DOCKER_COMPOSE_EXTRA_OPTS="${DOCKER_COMPOSE_EXTRA_OPTS:-}"
while :; do while :; do
case $1 in case $1 in
################################################# #################################################
# Disable color
#################################################
--no-ansi)
DOCKER_COMPOSE_EXTRA_OPTS+=" --no-ansi"
unset COLOR_R COLOR_G COLOR_Y COLOR_B COLOR_M COLOR_C COLOR_RESET
;;
#################################################
# Version switches # Version switches
################################################# #################################################
--latest) --latest)
@ -76,7 +85,7 @@ while :; do
export PLEUSTON_VERSION=${PLEUSTON_VERSION:-$OCEAN_VERSION} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-$OCEAN_VERSION}
;; ;;
--force-pull) --force-pull)
export forcepull="true" export FORCEPULL="true"
printf $COLOR_Y'Pulling latest components...\n\n'$COLOR_RESET printf $COLOR_Y'Pulling latest components...\n\n'$COLOR_RESET
;; ;;
################################################# #################################################
@ -98,6 +107,17 @@ while :; do
COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}" COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}"
printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET
;; ;;
#################################################
# Only Secret Store
#################################################
--only-secret-store)
COMPOSE_FILES=""
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml"
NODE_COMPOSE_FILE=""
printf $COLOR_Y'Starting only Secret Store...\n\n'$COLOR_RESET
;;
################################################# #################################################
# Contract/Storage switches # Contract/Storage switches
################################################# #################################################
@ -173,11 +193,9 @@ while :; do
;; ;;
*) *)
printf $COLOR_Y'Starting Ocean...\n\n'$COLOR_RESET printf $COLOR_Y'Starting Ocean...\n\n'$COLOR_RESET
if [[ $forcepull == "true" ]] [ ! -z ${NODE_COMPOSE_FILE} ] && COMPOSE_FILES+=" -f ${NODE_COMPOSE_FILE}"
then [ ${FORCEPULL} = "true" ] && docker-compose $DOCKER_COMPOSE_EXTRA_OPTS --project-name=$PROJECT_NAME $COMPOSE_FILES pull
docker-compose --project-name=$PROJECT_NAME $COMPOSE_FILES -f ${NODE_COMPOSE_FILE} pull eval docker-compose $DOCKER_COMPOSE_EXTRA_OPTS --project-name=$PROJECT_NAME $COMPOSE_FILES up --remove-orphans
fi
eval docker-compose --project-name=$PROJECT_NAME $COMPOSE_FILES -f ${NODE_COMPOSE_FILE} up --remove-orphans
break break
esac esac
shift shift