From 9ca966cb2f8453e602534a3d68718e7c1c73610a Mon Sep 17 00:00:00 2001 From: trentmc Date: Thu, 30 Nov 2023 13:47:42 +0100 Subject: [PATCH 1/4] update pdr-publisher.yml command, and remove RPC_URL & ADDRESS_FILE --- compose-files/pdr-publisher.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml index 0f6590c..81f72a6 100644 --- a/compose-files/pdr-publisher.yml +++ b/compose-files/pdr-publisher.yml @@ -2,13 +2,11 @@ version: '3' services: pdr-publisher: image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} - command: publisher + command: publisher ppss.yaml development networks: backend: ipv4_address: 172.15.0.43 environment: - RPC_URL: ${NETWORK_RPC_URL} - ADDRESS_FILE: /root/.ocean/ocean-contracts/artifacts/address.json PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58" OPF_DEPLOYER_PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58" PREDICTOOR_PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209" From f22e1564cd697657f5fd832929fe11180bf3b9a5 Mon Sep 17 00:00:00 2001 From: trentmc Date: Wed, 6 Dec 2023 17:32:29 +0100 Subject: [PATCH 2/4] change rest of pdr*.yml files --- compose-files/pdr-dfbuyer.yml | 5 +---- compose-files/pdr-predictoor.yml | 14 ++------------ compose-files/pdr-trader.yml | 5 +---- compose-files/pdr-trueval.yml | 5 +---- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/compose-files/pdr-dfbuyer.yml b/compose-files/pdr-dfbuyer.yml index 3e207c7..7871baf 100644 --- a/compose-files/pdr-dfbuyer.yml +++ b/compose-files/pdr-dfbuyer.yml @@ -2,18 +2,15 @@ version: "3" services: pdr-dfbuyer: image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} - command: dfbuyer + command: dfbuyer ppss.yaml development networks: backend: ipv4_address: 172.15.0.44 environment: - RPC_URL: ${NETWORK_RPC_URL} - SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph PRIVATE_KEY: "0x1f990f8b013fc5c7955e0f8746f11ded231721b9cf3f99ff06cdc03492b28090" WAIT_FOR_SUBGRAPH: "true" WEEKLY_SPEND_LIMIT: 10000 DELAYED_STARTUP: 120 - ADDRESS_FILE: /ocean-contracts/artifacts/address.json depends_on: - ganache volumes: diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml index ca94787..a244819 100644 --- a/compose-files/pdr-predictoor.yml +++ b/compose-files/pdr-predictoor.yml @@ -2,17 +2,14 @@ version: "3" services: pdr-predictoor1: image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} - command: predictoor + command: predictoor 1 ppss.yaml development networks: backend: ipv4_address: 172.15.0.41 environment: - RPC_URL: ${NETWORK_RPC_URL} - SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209" WAIT_FOR_SUBGRAPH: "true" DELAYED_STARTUP: 120 - ADDRESS_FILE: /ocean-contracts/artifacts/address.json depends_on: - ganache volumes: @@ -20,17 +17,13 @@ services: - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/ pdr-predictoor2: image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} - command: predictoor + command: predictoor 3 ppss.yaml development networks: backend: ipv4_address: 172.15.0.45 environment: - RPC_URL: ${NETWORK_RPC_URL} - SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph - PRIVATE_KEY: "0x4ed947ad7e139926e31a6442d55b2e99d141f97f46151a8769d57f514f3db868" WAIT_FOR_SUBGRAPH: "true" DELAYED_STARTUP: 120 - ADDRESS_FILE: /ocean-contracts/artifacts/address.json depends_on: - ganache volumes: @@ -43,12 +36,9 @@ services: backend: ipv4_address: 172.15.0.46 environment: - RPC_URL: ${NETWORK_RPC_URL} - SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph PRIVATE_KEY: "0xa50c16d96ed01ac8f967b77b01b1fa94f751c4c600b564fd770e239ebd7d869d" WAIT_FOR_SUBGRAPH: "true" DELAYED_STARTUP: 120 - ADDRESS_FILE: /ocean-contracts/artifacts/address.json depends_on: - ganache volumes: diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml index 3782ba4..0ff52b4 100644 --- a/compose-files/pdr-trader.yml +++ b/compose-files/pdr-trader.yml @@ -2,17 +2,14 @@ version: "3" services: pdr-trader: image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} - command: trader + command: trader 1 ppss.yaml development networks: backend: ipv4_address: 172.15.0.42 environment: - RPC_URL: ${NETWORK_RPC_URL} - SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99" WAIT_FOR_SUBGRAPH: "true" DELAYED_STARTUP: 120 - ADDRESS_FILE: /ocean-contracts/artifacts/address.json depends_on: - ganache volumes: diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml index ac92f17..6a69e14 100644 --- a/compose-files/pdr-trueval.yml +++ b/compose-files/pdr-trueval.yml @@ -2,17 +2,14 @@ version: "3" services: pdr-trueval: image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} - command: trueval + command: trueval ppss.yaml development networks: backend: ipv4_address: 172.15.0.40 environment: - RPC_URL: ${NETWORK_RPC_URL} - SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58" WAIT_FOR_SUBGRAPH: "true" DELAYED_STARTUP: 120 - ADDRESS_FILE: /ocean-contracts/artifacts/address.json depends_on: - ganache volumes: From 22d0a781d78f2c33b8e9664e167e107b1da0c933 Mon Sep 17 00:00:00 2001 From: trentmc Date: Wed, 6 Dec 2023 17:59:22 +0100 Subject: [PATCH 3/4] use yaml-cli2 branch image, vs main latest image --- compose-files/pdr-dfbuyer.yml | 2 +- compose-files/pdr-predictoor.yml | 2 +- compose-files/pdr-publisher.yml | 2 +- compose-files/pdr-trader.yml | 2 +- compose-files/pdr-trueval.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose-files/pdr-dfbuyer.yml b/compose-files/pdr-dfbuyer.yml index 7871baf..d2d5b14 100644 --- a/compose-files/pdr-dfbuyer.yml +++ b/compose-files/pdr-dfbuyer.yml @@ -1,7 +1,7 @@ version: "3" services: pdr-dfbuyer: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} command: dfbuyer ppss.yaml development networks: backend: diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml index a244819..c3ed5b7 100644 --- a/compose-files/pdr-predictoor.yml +++ b/compose-files/pdr-predictoor.yml @@ -1,7 +1,7 @@ version: "3" services: pdr-predictoor1: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} command: predictoor 1 ppss.yaml development networks: backend: diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml index 81f72a6..0891a9f 100644 --- a/compose-files/pdr-publisher.yml +++ b/compose-files/pdr-publisher.yml @@ -1,7 +1,7 @@ version: '3' services: pdr-publisher: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} command: publisher ppss.yaml development networks: backend: diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml index 0ff52b4..8c9977e 100644 --- a/compose-files/pdr-trader.yml +++ b/compose-files/pdr-trader.yml @@ -1,7 +1,7 @@ version: "3" services: pdr-trader: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} command: trader 1 ppss.yaml development networks: backend: diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml index 6a69e14..82e60d0 100644 --- a/compose-files/pdr-trueval.yml +++ b/compose-files/pdr-trueval.yml @@ -1,7 +1,7 @@ version: "3" services: pdr-trueval: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} command: trueval ppss.yaml development networks: backend: From 22a2fa5514863cee4e6a885f635d70c8eb770548 Mon Sep 17 00:00:00 2001 From: trizin <25263018+trizin@users.noreply.github.com> Date: Tue, 16 Jan 2024 19:47:55 +0300 Subject: [PATCH 4/4] yaml-cli2 -> latest --- compose-files/pdr-dfbuyer.yml | 2 +- compose-files/pdr-predictoor.yml | 2 +- compose-files/pdr-publisher.yml | 2 +- compose-files/pdr-trader.yml | 2 +- compose-files/pdr-trueval.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose-files/pdr-dfbuyer.yml b/compose-files/pdr-dfbuyer.yml index d2d5b14..7871baf 100644 --- a/compose-files/pdr-dfbuyer.yml +++ b/compose-files/pdr-dfbuyer.yml @@ -1,7 +1,7 @@ version: "3" services: pdr-dfbuyer: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} command: dfbuyer ppss.yaml development networks: backend: diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml index c3ed5b7..a244819 100644 --- a/compose-files/pdr-predictoor.yml +++ b/compose-files/pdr-predictoor.yml @@ -1,7 +1,7 @@ version: "3" services: pdr-predictoor1: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} command: predictoor 1 ppss.yaml development networks: backend: diff --git a/compose-files/pdr-publisher.yml b/compose-files/pdr-publisher.yml index 0891a9f..81f72a6 100644 --- a/compose-files/pdr-publisher.yml +++ b/compose-files/pdr-publisher.yml @@ -1,7 +1,7 @@ version: '3' services: pdr-publisher: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} command: publisher ppss.yaml development networks: backend: diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml index 8c9977e..0ff52b4 100644 --- a/compose-files/pdr-trader.yml +++ b/compose-files/pdr-trader.yml @@ -1,7 +1,7 @@ version: "3" services: pdr-trader: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} command: trader 1 ppss.yaml development networks: backend: diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml index 82e60d0..6a69e14 100644 --- a/compose-files/pdr-trueval.yml +++ b/compose-files/pdr-trueval.yml @@ -1,7 +1,7 @@ version: "3" services: pdr-trueval: - image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-yaml-cli2} + image: oceanprotocol/pdr-backend:${PDR_BACKEND_VERSION:-latest} command: trueval ppss.yaml development networks: backend: