TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2224 from nspcc-dev/fix-privnet

Browse source 
.docker: dynamically allocate IP for privnet
This commit is contained in:
Roman Khimov 2021-10-20 16:18:10 +03:00 committed by GitHub
commit 5ed0be9c27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.docker/docker-compose.yml
View file

@ -1,7 +1,7 @@
version: '2.4' version: '2.4'
networks: networks:
neo_go_network: default:
name: neo_go_network name: neo_go_network
ipam: ipam:
config: config:
@ -21,9 +21,6 @@ services:
- ../config/protocol.privnet.docker.one.yml:/config/protocol.privnet.yml - ../config/protocol.privnet.docker.one.yml:/config/protocol.privnet.yml
- ./wallets/wallet1.json:/wallet1.json - ./wallets/wallet1.json:/wallet1.json
- volume_chain:/chains - volume_chain:/chains
networks:
neo_go_network:
ipv4_address: 172.200.0.1
ports: ports:
- 20333:20333 - 20333:20333
- 30333:30333 - 30333:30333
@ -36,9 +33,6 @@ services:
- ../config/protocol.privnet.docker.two.yml:/config/protocol.privnet.yml - ../config/protocol.privnet.docker.two.yml:/config/protocol.privnet.yml
- ./wallets/wallet2.json:/wallet2.json - ./wallets/wallet2.json:/wallet2.json
- volume_chain:/chains - volume_chain:/chains
networks:
neo_go_network:
ipv4_address: 172.200.0.2
ports: ports:
- 20334:20334 - 20334:20334
- 30334:30334 - 30334:30334
@ -51,9 +45,6 @@ services:
- ../config/protocol.privnet.docker.three.yml:/config/protocol.privnet.yml - ../config/protocol.privnet.docker.three.yml:/config/protocol.privnet.yml
- ./wallets/wallet3.json:/wallet3.json - ./wallets/wallet3.json:/wallet3.json
- volume_chain:/chains - volume_chain:/chains
networks:
neo_go_network:
ipv4_address: 172.200.0.3
ports: ports:
- 20335:20335 - 20335:20335
- 30335:30335 - 30335:30335
@ -66,9 +57,6 @@ services:
- ../config/protocol.privnet.docker.four.yml:/config/protocol.privnet.yml - ../config/protocol.privnet.docker.four.yml:/config/protocol.privnet.yml
- ./wallets/wallet4.json:/wallet4.json - ./wallets/wallet4.json:/wallet4.json
- volume_chain:/chains - volume_chain:/chains
networks:
neo_go_network:
ipv4_address: 172.200.0.4
ports: ports:
- 20336:20336 - 20336:20336
- 30336:30336 - 30336:30336
@ -81,9 +69,6 @@ services:
- ../config/protocol.privnet.docker.single.yml:/config/protocol.privnet.yml - ../config/protocol.privnet.docker.single.yml:/config/protocol.privnet.yml
- ./wallets/wallet1_solo.json:/wallet1.json - ./wallets/wallet1_solo.json:/wallet1.json
- volume_chain:/chains - volume_chain:/chains
networks:
neo_go_network:
ipv4_address: 172.200.0.1
ports: ports:
- 20333:20333 - 20333:20333
- 30333:30333 - 30333:30333

16
config/protocol.privnet.docker.four.yml
View file

@ -10,10 +10,10 @@ ProtocolConfiguration:
- 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62 - 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62
ValidatorsCount: 4 ValidatorsCount: 4
SeedList: SeedList:
- 172.200.0.1:20333 - node_one:20333
- 172.200.0.2:20334 - node_two:20334
- 172.200.0.3:20335 - node_three:20335
- 172.200.0.4:20336 - node_four:20336
VerifyBlocks: true VerifyBlocks: true
VerifyTransactions: true VerifyTransactions: true
P2PSigExtensions: false P2PSigExtensions: false
@ -60,10 +60,10 @@ ApplicationConfiguration:
AllowedContentTypes: AllowedContentTypes:
- application/json - application/json
Nodes: Nodes:
- 172.200.0.1:30333 - node_one:30333
- 172.200.0.2:30334 - node_two:30334
- 172.200.0.3:30335 - node_three:30335
- 172.200.0.4:30336 - node_four:30336
RequestTimeout: 5s RequestTimeout: 5s
UnlockWallet: UnlockWallet:
Path: "/wallet4.json" Path: "/wallet4.json"

16
config/protocol.privnet.docker.one.yml
View file

@ -10,10 +10,10 @@ ProtocolConfiguration:
- 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62 - 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62
ValidatorsCount: 4 ValidatorsCount: 4
SeedList: SeedList:
- 172.200.0.1:20333 - node_one:20333
- 172.200.0.2:20334 - node_two:20334
- 172.200.0.3:20335 - node_three:20335
- 172.200.0.4:20336 - node_four:20336
VerifyBlocks: true VerifyBlocks: true
VerifyTransactions: true VerifyTransactions: true
P2PSigExtensions: false P2PSigExtensions: false
@ -60,10 +60,10 @@ ApplicationConfiguration:
AllowedContentTypes: AllowedContentTypes:
- application/json - application/json
Nodes: Nodes:
- 172.200.0.1:30333 - node_one:30333
- 172.200.0.2:30334 - node_two:30334
- 172.200.0.3:30335 - node_three:30335
- 172.200.0.4:30336 - node_four:30336
RequestTimeout: 5s RequestTimeout: 5s
UnlockWallet: UnlockWallet:
Path: "/wallet1.json" Path: "/wallet1.json"

4
config/protocol.privnet.docker.single.yml
View file

@ -7,7 +7,7 @@ ProtocolConfiguration:
- 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2
ValidatorsCount: 1 ValidatorsCount: 1
SeedList: SeedList:
- 172.200.0.1:20333 - node_single:20333
VerifyBlocks: true VerifyBlocks: true
VerifyTransactions: true VerifyTransactions: true
P2PSigExtensions: false P2PSigExtensions: false
@ -54,7 +54,7 @@ ApplicationConfiguration:
AllowedContentTypes: AllowedContentTypes:
- application/json - application/json
Nodes: Nodes:
- 172.200.0.1:30333 - node_single:30333
RequestTimeout: 5s RequestTimeout: 5s
UnlockWallet: UnlockWallet:
Path: "/wallet1_solo.json" Path: "/wallet1_solo.json"

16
config/protocol.privnet.docker.three.yml
View file

@ -10,10 +10,10 @@ ProtocolConfiguration:
- 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62 - 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62
ValidatorsCount: 4 ValidatorsCount: 4
SeedList: SeedList:
- 172.200.0.1:20333 - node_one:20333
- 172.200.0.2:20334 - node_two:20334
- 172.200.0.3:20335 - node_three:20335
- 172.200.0.4:20336 - node_four:20336
VerifyBlocks: true VerifyBlocks: true
VerifyTransactions: true VerifyTransactions: true
P2PSigExtensions: false P2PSigExtensions: false
@ -60,10 +60,10 @@ ApplicationConfiguration:
AllowedContentTypes: AllowedContentTypes:
- application/json - application/json
Nodes: Nodes:
- 172.200.0.1:30333 - node_one:30333
- 172.200.0.2:30334 - node_two:30334
- 172.200.0.3:30335 - node_three:30335
- 172.200.0.4:30336 - node_four:30336
RequestTimeout: 5s RequestTimeout: 5s
UnlockWallet: UnlockWallet:
Path: "/wallet3.json" Path: "/wallet3.json"

16
config/protocol.privnet.docker.two.yml
View file

@ -10,10 +10,10 @@ ProtocolConfiguration:
- 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62 - 02a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62
ValidatorsCount: 4 ValidatorsCount: 4
SeedList: SeedList:
- 172.200.0.1:20333 - node_one:20333
- 172.200.0.2:20334 - node_two:20334
- 172.200.0.3:20335 - node_three:20335
- 172.200.0.4:20336 - node_four:20336
VerifyBlocks: true VerifyBlocks: true
VerifyTransactions: true VerifyTransactions: true
P2PSigExtensions: false P2PSigExtensions: false
@ -60,10 +60,10 @@ ApplicationConfiguration:
AllowedContentTypes: AllowedContentTypes:
- application/json - application/json
Nodes: Nodes:
- 172.200.0.1:30333 - node_one:30333
- 172.200.0.2:30334 - node_two:30334
- 172.200.0.3:30335 - node_three:30335
- 172.200.0.4:30336 - node_four:30336
RequestTimeout: 5s RequestTimeout: 5s
UnlockWallet: UnlockWallet:
Path: "/wallet2.json" Path: "/wallet2.json"