Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9106149
support in cliain for version_upgrade
fixxxedpoint Nov 4, 2022
a13cc8f
support of our docker-compose to run using bridged docker's network
fixxxedpoint Nov 4, 2022
dc072d9
catchup_version_upgrade_test.sh
fixxxedpoint Nov 4, 2022
83e02be
added the catchup version upgrade test to github pipelines
fixxxedpoint Nov 4, 2022
143ec1b
review changes
fixxxedpoint Nov 6, 2022
8ca57d7
chmod +x catchup_version_upgrade_test.sh
fixxxedpoint Nov 7, 2022
02fd76b
review changes: using `matrix` for catch-up version upgrade test
fixxxedpoint Nov 7, 2022
87defd7
review changes: bumped version of aleph-client; added schedule_versio…
fixxxedpoint Nov 7, 2022
65a41f6
review changes: comment about key derivation in docker-compose `//1` …
fixxxedpoint Nov 7, 2022
4e05972
fix: e2e...yml: wrong `uses`
fixxxedpoint Nov 7, 2022
148439c
bumped e2e-tests/Cargo.lock
fixxxedpoint Nov 7, 2022
d3d65ed
fix: version_upgrade after api refactor
fixxxedpoint Nov 7, 2022
35563c7
review changes: added cache cleanup to build-cliain-image job
fixxxedpoint Nov 7, 2022
22dce1e
fix: typo in e2e...yml s/NODE2/Node2
fixxxedpoint Nov 7, 2022
781c881
fix for e2e...yml: fixed matrix-include for catch-up version upgrade …
fixxxedpoint Nov 7, 2022
999ef6f
Merge branch 'main' into message_compatibility-catchup
fixxxedpoint Nov 8, 2022
992926a
review changes: renamed local variable in catchup_version_upgrade.sh
fixxxedpoint Nov 8, 2022
dd9e3ed
Merge branch 'main' into message_compatibility-catchup
fixxxedpoint Nov 8, 2022
0b27557
more review changes for catchup_version_upgrade_test.sh
fixxxedpoint Nov 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
support of our docker-compose to run using bridged docker's network
  • Loading branch information
fixxxedpoint committed Nov 4, 2022
commit a13cc8f161bfb11dccabf6c25b4f4bf025aa907c
1 change: 0 additions & 1 deletion docker/common.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
services:
AlephNodeService:
image: aleph-node:latest
network_mode: host
environment:
- PURGE_BEFORE_START=true
- RUST_LOG=info
Expand Down
75 changes: 75 additions & 0 deletions docker/docker-compose.base.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# When increasing number of nodes in this file, change default value of --validators-count param in e2e-tests/src/config.rs

services:
Node0:
extends:
file: common.yml
service: AlephBootNode
container_name: Node0
environment:
- RPC_PORT=9933
- WS_PORT=9943
- PORT=30333
- VALIDATOR_PORT=30343
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30343
- NAME=Node0

Node1:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node1
environment:
- RPC_PORT=9934
- WS_PORT=9944
- PORT=30334
- VALIDATOR_PORT=30344
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30344
- NAME=Node1
- BASE_PATH=/data/5GBNeWRhZc2jXu7D55rBimKYDk8PGk8itRYFTPfC8RJLKG5o
- NODE_KEY_PATH=/data/5GBNeWRhZc2jXu7D55rBimKYDk8PGk8itRYFTPfC8RJLKG5o/p2p_secret

Node2:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node2
environment:
- RPC_PORT=9935
- WS_PORT=9945
- PORT=30335
- VALIDATOR_PORT=30345
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30345
- NAME=Node2
- BASE_PATH=/data/5Dfis6XL8J2P6JHUnUtArnFWndn62SydeP8ee8sG2ky9nfm9
- NODE_KEY_PATH=/data/5Dfis6XL8J2P6JHUnUtArnFWndn62SydeP8ee8sG2ky9nfm9/p2p_secret

Node3:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node3
environment:
- RPC_PORT=9936
- WS_PORT=9946
- PORT=30336
- VALIDATOR_PORT=30346
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30346
- NAME=Node3
- BASE_PATH=/data/5F4H97f7nQovyrbiq4ZetaaviNwThSVcFobcA5aGab6167dK
- NODE_KEY_PATH=/data/5F4H97f7nQovyrbiq4ZetaaviNwThSVcFobcA5aGab6167dK/p2p_secret

Node4:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node4
environment:
- RPC_PORT=9937
- WS_PORT=9947
- PORT=30337
- VALIDATOR_PORT=30347
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30347
- NAME=Node4
- BASE_PATH=/data/5DiDShBWa1fQx6gLzpf3SFBhMinCoyvHM1BWjPNsmXS8hkrW
- NODE_KEY_PATH=/data/5DiDShBWa1fQx6gLzpf3SFBhMinCoyvHM1BWjPNsmXS8hkrW/p2p_secret
62 changes: 62 additions & 0 deletions docker/docker-compose.bridged.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
services:
Node0:
extends:
file: docker-compose.base.yml
service: Node0
networks:
- main
- Node0

Node1:
extends:
file: docker-compose.base.yml
service: Node1
networks:
- main
- Node1
environment:
- BOOT_NODES=/dns4/Node0/tcp/30333/p2p/$BOOTNODE_PEER_ID

Node2:
extends:
file: docker-compose.base.yml
service: Node2
networks:
- main
- Node2
environment:
- BOOT_NODES=/dns4/Node0/tcp/30333/p2p/$BOOTNODE_PEER_ID

Node3:
extends:
file: docker-compose.base.yml
service: Node3
networks:
- main
- Node3
environment:
- BOOT_NODES=/dns4/Node0/tcp/30333/p2p/$BOOTNODE_PEER_ID

Node4:
extends:
file: docker-compose.base.yml
service: Node4
networks:
- main
- Node4
environment:
- BOOT_NODES=/dns4/Node0/tcp/30333/p2p/$BOOTNODE_PEER_ID

networks:
main:
name: main-network
Node0:
name: Node0-network
Node1:
name: Node1-network
Node2:
name: Node2-network
Node3:
name: Node3-network
Node4:
name: Node4-network
73 changes: 15 additions & 58 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,30 @@
services:
Node0:
extends:
file: common.yml
service: AlephBootNode
container_name: Node0
environment:
- RPC_PORT=9933
- WS_PORT=9943
- PORT=30333
- VALIDATOR_PORT=30343
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30343
- NAME=Node0
file: docker-compose.base.yml
service: Node0
network_mode: host

Node1:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node1
environment:
- RPC_PORT=9934
- WS_PORT=9944
- PORT=30334
- VALIDATOR_PORT=30344
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30344
- NAME=Node1
- BASE_PATH=/data/5GBNeWRhZc2jXu7D55rBimKYDk8PGk8itRYFTPfC8RJLKG5o
- NODE_KEY_PATH=/data/5GBNeWRhZc2jXu7D55rBimKYDk8PGk8itRYFTPfC8RJLKG5o/p2p_secret
file: docker-compose.base.yml
service: Node1
network_mode: host

Node2:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node2
environment:
- RPC_PORT=9935
- WS_PORT=9945
- PORT=30335
- VALIDATOR_PORT=30345
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30345
- NAME=Node2
- BASE_PATH=/data/5Dfis6XL8J2P6JHUnUtArnFWndn62SydeP8ee8sG2ky9nfm9
- NODE_KEY_PATH=/data/5Dfis6XL8J2P6JHUnUtArnFWndn62SydeP8ee8sG2ky9nfm9/p2p_secret
file: docker-compose.base.yml
service: Node2
network_mode: host

Node3:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node3
environment:
- RPC_PORT=9936
- WS_PORT=9946
- PORT=30336
- VALIDATOR_PORT=30346
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30346
- NAME=Node3
- BASE_PATH=/data/5F4H97f7nQovyrbiq4ZetaaviNwThSVcFobcA5aGab6167dK
- NODE_KEY_PATH=/data/5F4H97f7nQovyrbiq4ZetaaviNwThSVcFobcA5aGab6167dK/p2p_secret
file: docker-compose.base.yml
service: Node3
network_mode: host

Node4:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node4
environment:
- RPC_PORT=9937
- WS_PORT=9947
- PORT=30337
- VALIDATOR_PORT=30347
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30347
- NAME=Node4
- BASE_PATH=/data/5DiDShBWa1fQx6gLzpf3SFBhMinCoyvHM1BWjPNsmXS8hkrW
- NODE_KEY_PATH=/data/5DiDShBWa1fQx6gLzpf3SFBhMinCoyvHM1BWjPNsmXS8hkrW/p2p_secret
file: docker-compose.base.yml
service: Node4
network_mode: host