Skip to content

M
metadeploy
Commit e1e93d2a authored by 贾浩@五瓣科技's avatar 贾浩@五瓣科技
Browse files
Options

update

parent c2312097
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 86 deletions
docker-compose.yml
View file @ e1e93d2a
......@@ -2,7 +2,7 @@ version: "3.9"
services:
net:
image: 192.168.1.220:5000/metanet:0.1
image: 192.168.1.220:5000/metanet:v0.0.1
container_name: net
volumes:
- ./net/net1/:/root/net/
......@@ -15,17 +15,12 @@ services:
delay: 15s
max_attempts: 100
window: 120s
networks:
meta:
ipv4_address: 172.99.0.1
net2:
image: net
container_name: net2
volumes:
- ./net/net2/:/root/net/
entrypoint: /bin/sh /root/net/start.sh
ports:
- "38011:38010"
net2:
image: 192.168.1.220:5000/metanet:latest
image: 192.168.1.220:5000/metanet:v0.0.1
container_name: net2
volumes:
- ./net/net2/:/root/net/
......@@ -38,10 +33,13 @@ services:
delay: 15s
max_attempts: 100
window: 120s
networks:
meta:
ipv4_address: 172.99.0.2
nebula2:
image: nebula
container_name: nebula2
nebula:
image: 192.168.1.220:5000/nebula:v0.0.1
container_name: nebula
depends_on:
- net
- net2
......@@ -53,9 +51,11 @@ services:
max_attempts: 100
window: 120s
volumes:
- ./nebula/nebula2/config.toml:/root/config.toml
- ./nebula/nebula2/genesis.json:/root/genesis.json
- ./nebula/nebula2/data:/root/data
- ./nebula/config.toml:/root/config.toml
- ./nebula/genesis.json:/root/genesis.json
- ./data/nebula:/root/data
networks:
- meta
nebula2:
image: 192.168.1.220:5000/nebula:v0.0.1
......@@ -71,9 +71,11 @@ services:
max_attempts: 100
window: 120s
volumes:
- ./nebula/nebula2/config.toml:/root/config.toml
- ./nebula/nebula2/genesis.json:/root/genesis.json
- ./nebula/nebula2/data:/root/data
- ./nebula/config.toml:/root/config.toml
- ./nebula/genesis.json:/root/genesis.json
- ./data/nebula2:/root/data
networks:
- meta
cryptor1:
image: 192.168.1.220:5000/cryptor:v0.0.1
......@@ -86,6 +88,8 @@ services:
window: 120s
volumes:
- ./cryptor/config.toml:/root/config.toml
networks:
- meta
cryptor2:
image: 192.168.1.220:5000/cryptor:v0.0.1
......@@ -98,6 +102,8 @@ services:
window: 120s
volumes:
- ./cryptor/config.toml:/root/config.toml
networks:
- meta
ring1:
image: 192.168.1.220:5000/ring:v0.0.1
......@@ -105,7 +111,6 @@ services:
entrypoint: sh -c 'echo "ring" && sleep 10 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor1:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=60 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 >> /data/log' #>> /data/log
volumes:
- ./data/metaring1:/data
depends_on:
- cryptor1
- net
......@@ -125,19 +130,19 @@ services:
max_attempts: 100
window: 120s
ports:
<<<<<<< HEAD
- 8545:8545
- 5001:5001
- 38020:38020
- 6060:6060
networks:
- meta
ring2:
image: 192.168.1.220:5000/ring:v0.0.1
container_name: ring2
entrypoint: sh -c 'echo "ring" && sleep 1 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula2:38004 --mempool.p2purl net2:38010 --mempool.cryptourl cryptor2:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=60 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 >> /data/log' #>> /data/log
volumes:
- ./data/metaring2:/data
depends_on:
- cryptor2
- net
......@@ -160,7 +165,8 @@ services:
- 5002:5001
- 38021:38020
- 6061:6060
networks:
- meta
prometheus:
image: prom/prometheus:latest
......@@ -173,6 +179,8 @@ services:
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
depends_on:
- cadvisor
networks:
- meta
cadvisor:
#image: gcr.io/cadvisor/cadvisor:latest
......@@ -194,3 +202,12 @@ services:
- txchecker
- nebula
- nebula2
networks:
- meta
networks:
meta:
driver: bridge
ipam:
config:
- subnet: 172.99.0.0/16
\ No newline at end of file
nebula/nebula2/genesis.json deleted 100644 → 0
View file @ c2312097
{
"miner": "0x905D5E8F7db76bCA91fdcA0990be7263dfD23335",
"timestamp": 1676518132,
"extraData": "0x",
"accounts": {
"0x0000000000000000000000000000000000000001": {
"nonce": "0",
"balance":"10000000000000000000000"
},
"0x905D5E8F7db76bCA91fdcA0990be7263dfD23335": {
"nonce": "10",
"balance": "0x20000000000"
},
"0x64fB93d7eBEa9fae570F2852C270F137cF60ba90": {
"nonce": "0",
"balance": "0x200000000000000000000000000"
},
"0x78328fa01CEE3B31129f85b6174a28C42c85fbBF":{
"nonce": "0",
"balance": "0x2000000000000000000000000000"
},
"0xc49926c4124cee1cba0ea94ea31a6c12318df947":{
"nonce": "0",
"balance": "0x2000000000000000000000000000"
},
"0x2A5Ff76F69E893b113F8cC788e2c64960f3648cB": {
"nonce": "0",
"balance": "0x200000000000000000000000000"
},
"0x257A1F95F3C09a0A2F4d82d3f916E8DbCE084659": {
"nonce": "0",
"balance": "0x200000000000000000000000000"
}
}
}
net/net1/start.sh
View file @ e1e93d2a
#!/bin/bash
NET1_HOST="net"
NET1_IP=$(nslookup $NET1_HOST | awk '/^Address: / { print $2 }')
NET2_HOST="net2"
NET2_IP=$(nslookup $NET2_HOST | awk '/^Address: / { print $2 }')
echo "IP address of $NET1_HOST is $NET1_IP"
echo "IP address of $NET2_HOST is $NET2_IP"
echo "/root/MetaNet --single-node --enable-prom --log-level debug \
/root/MetaNet --single-node --enable-prom --log-level debug \
--p2p-priv-key a5b18000b95e9e8e2afe5d49355b48c99aeee9e986ddc144af848847afd18df3 \
--grpc-host 0.0.0.0 --grpc-port 38010 --p2p-host-ip $NET1_IP"
\ No newline at end of file
--grpc-host 0.0.0.0 --grpc-port 38010 --p2p-host-ip 172.99.0.1
\ No newline at end of file
net/net2/start.sh
View file @ e1e93d2a
#!/bin/bash
NET1_HOST = "net"
NET1_IP = $(nslookup $NET1_HOST | awk '/^Address: / { print $2 }')
NET2_HOST = "net2"
NET2_IP = $(nslookup $NET2_HOST | awk '/^Address: / { print $2 }')
echo "IP address of $NET1_HOST is $NET1_IP"
echo "IP address of $NET2_HOST is $NET2_IP"
/root/MetaNet --single-node --enable-prom --log-level debug \
--peer /ip4/$NET1_IP/tcp/30333/p2p/16Uiu2HAkzyUdhtxksEjKmYukux7ecvzw9JFKqHsy1iDYYDuck12h \
--grpc-host 0.0.0.0 --grpc-port 38010 --p2p-host-ip $NET2_IP
\ No newline at end of file
--peer /ip4/172.99.0.1/tcp/30333/p2p/16Uiu2HAkzyUdhtxksEjKmYukux7ecvzw9JFKqHsy1iDYYDuck12h \
--grpc-host 0.0.0.0 --grpc-port 38010 --p2p-host-ip 172.99.0.2
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment