Merge branch 'develop' of github.com:oceanprotocol/docker-images into fix/default_env

docker-compose-local-parity-node.yml

@@ -14,7 +14,10 @@ services:
   parity-node:
     image: parity/parity:stable
     command:
-      --config /parity/config/validator.toml
+      --config /home/parity/parity/config/validator.toml
+      --db-path /home/parity/chains
+      --keys-path /home/parity/.local/share/io.parity.ethereum/keys
+      --base-path /home/parity/base
       --engine-signer 0x00bd138abd70e2f00903268f3db08f2d25677c9e
       --jsonrpc-interface 0.0.0.0
       --ws-interface 0.0.0.0
@@ -22,13 +25,14 @@ services:
       --unsafe-expose
       --jsonrpc-cors all
       --unlock 0x00bd138abd70e2f00903268f3db08f2d25677c9e
+    # entrypoint: tail -f /dev/null
     volumes:
-      - ./parity/parity/config:/parity/config:ro
-      - parity-node:/root/.local/share/io.parity.ethereum/
-      - ./parity/parity/authorities/validator0.json:/root/.local/share/io.parity.ethereum/keys/ocean-network/validator.json:ro
-      - ./parity/parity/keys:/root/.local/share/io.parity.ethereum/keys/ocean-network
-      - ./parity/parity/authorities/validator0.pwd:/parity/validator.pwd:ro
-      - ./parity/parity/node0.network.key:/root/.local/share/io.parity.ethereum/network/key:ro
+      - ./parity/parity/config:/home/parity/parity/config
+      - parity-node:/home/parity/.local/share/io.parity.ethereum/
+      - ./parity/parity/authorities/validator0.json:/home/parity/.local/share/io.parity.ethereum/keys/ocean-network/validator.json
+      - ./parity/parity/keys:/home/parity/.local/share/io.parity.ethereum/keys/ocean-network
+      - ./parity/parity/authorities/validator0.pwd:/home/parity/parity/validator.pwd
+      - ./parity/parity/node0.network.key:/home/parity/.local/share/io.parity.ethereum/network/key
     ports:
       - 8545:8545
     networks:

docker-compose-no-pleuston.yml

@@ -42,6 +42,20 @@ services:
     volumes:
     - ${ARTIFACTS_FOLDER}:/usr/local/keeper-contracts/:ro
 
+  brizo:
+    image: oceanprotocol/brizo:${OCEAN_VERSION:-stable}
+    ports:
+    - 8030:8030
+    networks:
+    - backend
+    depends_on:
+    - keeper-contracts
+    environment:
+      KEEPER_URL: http://keeper-contracts:8545
+      LOCAL_CONTRACTS: "true"
+    volumes:
+    - ${ARTIFACTS_FOLDER}:/usr/local/keeper-contracs/:ro
+
 networks:
   backend:
 

docker-compose.yml

@@ -36,12 +36,26 @@ services:
     depends_on:
     - keeper-contracts
     environment:
-      KEEPER_URL: http://keeper-contracts:8545
+      KEEPER_URL: http://keeper-contracts:8545 
       DB_HOSTNAME: mongodb
       LOCAL_CONTRACTS: "true"
     volumes:
     - ${ARTIFACTS_FOLDER}:/usr/local/keeper-contracts/:ro
 
+  brizo:
+    image: oceanprotocol/brizo:${OCEAN_VERSION:-stable}
+    ports:
+    - 8030:8030
+    networks:
+    - backend
+    depends_on:
+    - keeper-contracts
+    environment:
+      KEEPER_URL: http://keeper-contracts:8545
+      LOCAL_CONTRACTS: "true"
+    volumes:
+    - ${ARTIFACTS_FOLDER}:/usr/local/keeper-contracts/:ro
+
   pleuston:
     image: oceanprotocol/pleuston:${OCEAN_VERSION:-stable}
     ports:

parity/parity/config/validator.toml

@@ -1,5 +1,5 @@
 [parity]
-chain = "/parity/config/chain.json"
+chain = "/home/parity/parity/config/chain.json"
 
 [rpc]
 interface = "0.0.0.0"
@@ -15,7 +15,7 @@ bootnodes = [
 ]
 
 [account]
-password = ["/parity/validator.pwd"]
+password = ["/home/parity/parity/validator.pwd"]
 
 [mining]
 reseal_on_txs = "none"

parity/parity/keys/validator.json

@@ -0,0 +1,23 @@
+{
+  "id": "0902d04b-f26e-5c1f-e3ae-78d2c1cb16e7",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "6a829fe7bc656d85f6c2e9fd21784952"
+    },
+    "ciphertext": "1bfec0b054a648af8fdd0e85662206c65a4af0ed15fede4ad41ca9ab7b504ce2",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "95f96b5ee22dd537e06076eb8d7078eb7275d29af935782fe476696b11be50e5"
+    },
+    "mac": "4af2215c3cd9447a5b0512d7d1c3ea5a4435981e1c8f48bf71d7a49c0e5b4986"
+  },
+  "address": "00bd138abd70e2f00903268f3db08f2d25677c9e",
+  "name": "Validator0",
+  "meta": "{}"
+}
+