diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-12-11 19:55:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 19:55:10 +0800 |
| commit | 5584574217df29f5daf5db70b3d2536ec66a036c (patch) | |
| tree | 1996772ad613417eb26b98c1fe21763c68caa853 | |
| parent | bb724080cac9fa36ec6b638cfd5cf0e54bc23362 (diff) | |
| parent | 38c3d88cea61361afe332437581dac8b40adbfca (diff) | |
| download | dexon-5584574217df29f5daf5db70b3d2536ec66a036c.tar dexon-5584574217df29f5daf5db70b3d2536ec66a036c.tar.gz dexon-5584574217df29f5daf5db70b3d2536ec66a036c.tar.bz2 dexon-5584574217df29f5daf5db70b3d2536ec66a036c.tar.lz dexon-5584574217df29f5daf5db70b3d2536ec66a036c.tar.xz dexon-5584574217df29f5daf5db70b3d2536ec66a036c.tar.zst dexon-5584574217df29f5daf5db70b3d2536ec66a036c.zip | |
Merge pull request #18281 from karalabe/puppeth-faucet
cmd/faucet, cmd/puppeth: fix enode and compose regressions, expose UDP
| -rw-r--r-- | cmd/faucet/faucet.go | 2 | ||||
| -rw-r--r-- | cmd/puppeth/module_ethstats.go | 3 | ||||
| -rw-r--r-- | cmd/puppeth/module_explorer.go | 1 | ||||
| -rw-r--r-- | cmd/puppeth/module_faucet.go | 4 | ||||
| -rw-r--r-- | cmd/puppeth/module_nginx.go | 1 | ||||
| -rw-r--r-- | cmd/puppeth/module_node.go | 1 | ||||
| -rw-r--r-- | cmd/puppeth/module_wallet.go | 1 |
7 files changed, 10 insertions, 3 deletions
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 2ffe12276..a7c20db77 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -256,7 +256,7 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*discv5.Node, network u } for _, boot := range enodes { old, err := enode.ParseV4(boot.String()) - if err != nil { + if err == nil { stack.Server().AddPeer(old) } } diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index a7d99a297..58ecb8395 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -43,7 +43,8 @@ version: '2' services: ethstats: build: . - image: {{.Network}}/ethstats{{if not .VHost}} + image: {{.Network}}/ethstats + container_name: {{.Network}}_ethstats_1{{if not .VHost}} ports: - "{{.Port}}:3000"{{end}} environment: diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index e916deaf6..e465fa04a 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -77,6 +77,7 @@ services: explorer: build: . image: {{.Network}}/explorer + container_name: {{.Network}}_explorer_1 ports: - "{{.NodePort}}:{{.NodePort}}" - "{{.NodePort}}:{{.NodePort}}/udp"{{if not .VHost}} diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 06c9fc0f5..3a06bf3c6 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -56,8 +56,10 @@ services: faucet: build: . image: {{.Network}}/faucet + container_name: {{.Network}}_faucet_1 ports: - - "{{.EthPort}}:{{.EthPort}}"{{if not .VHost}} + - "{{.EthPort}}:{{.EthPort}}" + - "{{.EthPort}}:{{.EthPort}}/udp"{{if not .VHost}} - "{{.ApiPort}}:8080"{{end}} volumes: - {{.Datadir}}:/root/.faucet diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 7f87661d3..1b1ae61ff 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -40,6 +40,7 @@ services: nginx: build: . image: {{.Network}}/nginx + container_name: {{.Network}}_nginx_1 ports: - "{{.Port}}:80" volumes: diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 069adfe4f..5d9ef4652 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -55,6 +55,7 @@ services: {{.Type}}: build: . image: {{.Network}}/{{.Type}} + container_name: {{.Network}}_{{.Type}}_1 ports: - "{{.Port}}:{{.Port}}" - "{{.Port}}:{{.Port}}/udp" diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 90812c4a0..ebaa5b6ae 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -57,6 +57,7 @@ services: wallet: build: . image: {{.Network}}/wallet + container_name: {{.Network}}_wallet_1 ports: - "{{.NodePort}}:{{.NodePort}}" - "{{.NodePort}}:{{.NodePort}}/udp" |