add commons,remove pleuston

compose-files/commons.yml

@@ -0,0 +1,36 @@
+version: '3'
+services:
+  commonsserver:
+    image: oceanprotocol/commons_server:$COMMONS_SERVER_VERSION
+    networks:
+      backend:
+        ipv4_address: 172.15.0.23
+    ports:
+      - 4000:4000
+
+  commonsclient:
+    image: oceanprotocol/commons_client:$COMMONS_CLIENT_VERSION
+    networks:
+      backend:
+        ipv4_address: 172.15.0.24
+    ports:
+      - 3000:3000
+    depends_on:
+    - keeper-node
+    - aquarius
+    - brizo
+    - commonsserver
+    environment:
+      LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS}
+      REACT_APP_AQUARIUS_URI: ${AQUARIUS_URI}
+      REACT_APP_BRIZO_ADDRESS: ${PROVIDER_ADDRESS}
+      LISTEN_ADDRESS: '0.0.0.0'
+      REACT_APP_SERVICE_URI: ${COMMONS_SERVER_URL}
+      REACT_APP_NODE_URI: ${KEEPER_RPC_URL}
+      REACT_APP_BRIZO_URI: ${BRIZO_URL}
+      REACT_APP_SECRET_STORE_URI: ${SECRET_STORE_URL}
+      REACT_APP_FAUCET_URI: ${FAUCET_URL}
+    volumes:
+    - ${KEEPER_ARTIFACTS_FOLDER}:/app/frontend/node_modules/@oceanprotocol/keeper-contracts/artifacts/:ro
+
+

start_ocean.sh

@@ -19,6 +19,8 @@ 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}
 export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.1}
+export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v0.6.3}
+export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v0.6.2}
 
 export PARITY_IMAGE="parity/parity:v2.5.1"
 
@@ -67,7 +69,7 @@ CHECK_ELASTIC_VM_COUNT=true
 export BRIZO_WORKERS=${BRIZO_WORKERS:-5}
 export BRIZO_LOG_LEVEL="INFO"
 export EVENTS_HANDLER_LOG_LEVEL="INFO"
-
+export BRIZO_URL=http://localhost:8030
 # Set a valid parity address and password to have seamless interaction with the `keeper`
 # it has to exist on the secret store signing node and as well on the keeper node
 export PROVIDER_ADDRESS=0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0
@@ -82,6 +84,9 @@ export AQUARIUS_URI=http://localhost:5000
 
 # Default Faucet options
 export FAUCET_TIMESPAN=${FAUCET_TIMESPAN:-24}
+export FAUCET_URL=http://localhost:3001
+export COMMONS_SERVER_URL=http://localhost:4000
+export COMMONS_CLIENT_URL=http://localhost:3000
 
 # Export User UID and GID
 export LOCAL_USER_ID=$(id -u)
@@ -159,7 +164,8 @@ show_banner
 COMPOSE_FILES=""
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/keeper_contracts.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml"
-COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml"
+##COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml"
+COMPOSE_FILES+=" -f ${COMPOSE_DIR}/commons.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml"
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/events_handler.yml"
@@ -194,8 +200,10 @@ while :; do
             export EVENTS_HANDLER_VERSION="latest"
             export KEEPER_VERSION="latest"
             # TODO: Change label on Docker to refer `latest` to `master`
-            export PLEUSTON_VERSION="master"
+            #export PLEUSTON_VERSION="master"
             export FAUCET_VERSION="latest"
+	    export COMMONS_SERVER_VERSION="latest"
+	    export COMMONS_CLIENT_VERSION="latest"
             printf $COLOR_Y'Switched to latest components...\n\n'$COLOR_RESET
             ;;
         --force-pull)
@@ -205,10 +213,15 @@ while :; do
         #################################################
         # Exclude switches
         #################################################
-        --no-pleuston)
-            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/pleuston.yml/}"
-            printf $COLOR_Y'Starting without Pleuston...\n\n'$COLOR_RESET
+#        --no-pleuston)
+#            COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/pleuston.yml/}"
+#            printf $COLOR_Y'Starting without Pleuston...\n\n'$COLOR_RESET
+#            ;;
+	--no-commons)
+	    COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/commons.yml/}"
+            printf $COLOR_Y'Starting without Commons...\n\n'$COLOR_RESET
             ;;
+
         --no-events-handler)
             COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/events_handler.yml/}"
             printf $COLOR_Y'Starting without Events Handler...\n\n'$COLOR_RESET