Skip to content

Commit 74f9c2d

Browse files
authored
restore default 'sdd start' to its original non-broken behavior, rest… (#209)
* restore default 'sdd start' to its original non-broken behavior, restore ci work flow to start the default set of containers * new stack is now completely independent of old stack and both can be run at the same time
1 parent ea05387 commit 74f9c2d

File tree

2 files changed

+85
-58
lines changed

2 files changed

+85
-58
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Check out the repo
4848
uses: actions/[email protected]
4949
- name: Start Streamr Docker Stack
50-
run: ./streamr-docker-dev/bin.sh start --except deploy-network-subgraphs --except graph-node --except graph-deploy-tatum-subgraph --except graph-deploy-streamregistry-subgraph --except deploy-hub-subgraph --except graph-deploy-dataunion-subgraph --wait --timeout 600
50+
run: ./streamr-docker-dev/bin.sh start --wait --timeout 600
5151
- name: Collect docker logs on failure
5252
if: failure()
5353
uses: jwalton/[email protected]

docker-compose.yml

Lines changed: 84 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -322,19 +322,6 @@ services:
322322
target: /home/parity/parity_data
323323
volume:
324324
nocopy: true
325-
dev-chain-fast:
326-
container_name: streamr-dev-chain-fast
327-
image: streamr/dev-chain-fast:dev
328-
networks:
329-
- streamr-network
330-
ports:
331-
- "8547:8545"
332-
restart: unless-stopped
333-
healthcheck:
334-
test: ["CMD", "curl", "--fail", "--silent", "--show-error", "--max-time", "9", "--header", "Content-Type: application/json", "--data", '[{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1},{"jsonrpc":"2.0","method":"eth_syncing","params":[],"id":1}]', "http://localhost:8545/api/health"]
335-
interval: 1m30s
336-
timeout: 10s
337-
retries: 3
338325
graph-node:
339326
container_name: streamr-dev-thegraph-node
340327
image: graphprotocol/graph-node:v0.30.0
@@ -365,36 +352,6 @@ services:
365352
interval: 5s
366353
timeout: 10s
367354
retries: 10
368-
graph-node-fastchain:
369-
container_name: streamr-dev-thegraph-node
370-
image: graphprotocol/graph-node:v0.30.0
371-
restart: unless-stopped
372-
networks:
373-
- streamr-network
374-
ports:
375-
- '8000:8000'
376-
- '8001:8001'
377-
- '8020:8020'
378-
- '8030:8030'
379-
- '8040:8040'
380-
depends_on:
381-
- ipfs
382-
- postgres
383-
- dev-chain-fast
384-
environment:
385-
postgres_host: postgres
386-
postgres_user: streamr
387-
postgres_pass: let-me-in
388-
postgres_db: streamr
389-
ipfs: 'streamr-dev-ipfs:5001'
390-
ethereum: 'xDai:http://streamr-dev-chain-fast:8545'
391-
RUST_LOG: info
392-
GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true"
393-
healthcheck:
394-
test: ["CMD", "nc", "-z", "localhost", "8000"]
395-
interval: 5s
396-
timeout: 10s
397-
retries: 10
398355
graph-deploy-streamregistry-subgraph:
399356
container_name: streamr-dev-graph-deploy-streamregistry-subgraph
400357
image: streamr/graph-deploy-streamregistry-subgraph:dev
@@ -423,20 +380,6 @@ services:
423380
target: /firstrun
424381
volume:
425382
nocopy: false
426-
deploy-network-subgraphs-fastchain:
427-
container_name: streamr-dev-deploy-network-subgraphs
428-
image: streamr/deploy-network-subgraphs:dev-fastchain
429-
restart: on-failure # exits on success
430-
networks:
431-
- streamr-network
432-
depends_on:
433-
- graph-node-fastchain
434-
volumes:
435-
- type: volume
436-
source: data-graph-deploy
437-
target: /firstrun
438-
volume:
439-
nocopy: false
440383
deploy-hub-subgraph:
441384
container_name: streamr-dev-deploy-hub-subgraph
442385
image: streamr/deploy-hub-subgraph:dev
@@ -500,6 +443,88 @@ services:
500443
interval: 5s
501444
timeout: 10s
502445
retries: 10
446+
dev-chain-fast:
447+
container_name: streamr-dev-chain-fast
448+
image: streamr/dev-chain-fast:dev
449+
networks:
450+
- streamr-network
451+
ports:
452+
- "8547:8545"
453+
restart: unless-stopped
454+
healthcheck:
455+
test: ["CMD", "curl", "--fail", "--silent", "--show-error", "--max-time", "9", "--header", "Content-Type: application/json", "--data", '[{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1},{"jsonrpc":"2.0","method":"eth_syncing","params":[],"id":1}]', "http://localhost:8545/api/health"]
456+
interval: 1m30s
457+
timeout: 10s
458+
retries: 3
459+
graph-node-fastchain:
460+
container_name: streamr-dev-thegraph-node-fastchain
461+
image: graphprotocol/graph-node:v0.30.0
462+
restart: unless-stopped
463+
networks:
464+
- streamr-network
465+
ports:
466+
- '8800:8000'
467+
# - '8001:8001'
468+
# - '8020:8020'
469+
# - '8030:8030'
470+
# - '8040:8040'
471+
depends_on:
472+
- ipfs
473+
- postgres-fastchain
474+
- dev-chain-fast
475+
environment:
476+
postgres_host: postgres-fastchain
477+
postgres_user: streamr
478+
postgres_pass: let-me-in
479+
postgres_db: streamr
480+
ipfs: 'streamr-dev-ipfs:5001'
481+
ethereum: 'xDai:http://streamr-dev-chain-fast:8545'
482+
RUST_LOG: info
483+
GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH: "true"
484+
healthcheck:
485+
test: ["CMD", "nc", "-z", "localhost", "8000"]
486+
interval: 5s
487+
timeout: 10s
488+
retries: 10
489+
deploy-network-subgraphs-fastchain:
490+
container_name: streamr-dev-deploy-network-subgraphs-fastchain
491+
image: streamr/deploy-network-subgraphs:dev-fastchain
492+
restart: on-failure # exits on success
493+
networks:
494+
- streamr-network
495+
depends_on:
496+
- graph-node-fastchain
497+
volumes:
498+
- type: volume
499+
source: data-graph-deploy-fastchain
500+
target: /firstrun
501+
volume:
502+
nocopy: false
503+
postgres-fastchain:
504+
container_name: streamr-dev-postgres-fastchain
505+
image: postgres
506+
restart: unless-stopped
507+
networks:
508+
- streamr-network
509+
# ports:
510+
# - '5432:5432'
511+
command: ["postgres", "-cshared_preload_libraries=pg_stat_statements"]
512+
environment:
513+
POSTGRES_USER: streamr
514+
POSTGRES_PASSWORD: let-me-in
515+
POSTGRES_DB: streamr
516+
POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C"
517+
volumes:
518+
- type: volume
519+
source: data-postgres-fastchain
520+
target: /var/lib/postgresql/data
521+
volume:
522+
nocopy: true
523+
healthcheck:
524+
test: ["CMD-SHELL", "pg_isready -U streamr -d streamr"]
525+
interval: 5s
526+
timeout: 10s
527+
retries: 10
503528
postgres:
504529
container_name: streamr-dev-postgres
505530
image: postgres
@@ -565,7 +590,9 @@ volumes:
565590
data-parity-sidechain-node0:
566591
data-ipfs:
567592
data-postgres:
593+
data-postgres-fastchain:
568594
data-graph-deploy:
595+
data-graph-deploy-fastchain:
569596
data-graph-deploy-legacy:
570597
data-deploy-hub-subgraph:
571598
data-graph-deploy-dataunion:

0 commit comments

Comments
 (0)