diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-24 18:59:48 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | d4f73229104ee8f12737ce5b3da4c9360d02dbeb (patch) | |
| tree | cfe0626288a7c36300791ac1f5d1843e5114f7ee /cmd/puppeth/module_node.go | |
| parent | 08720a6cc45e2ce975b8284d91b2ebe9e40b46f7 (diff) | |
| download | dexon-d4f73229104ee8f12737ce5b3da4c9360d02dbeb.tar dexon-d4f73229104ee8f12737ce5b3da4c9360d02dbeb.tar.gz dexon-d4f73229104ee8f12737ce5b3da4c9360d02dbeb.tar.bz2 dexon-d4f73229104ee8f12737ce5b3da4c9360d02dbeb.tar.lz dexon-d4f73229104ee8f12737ce5b3da4c9360d02dbeb.tar.xz dexon-d4f73229104ee8f12737ce5b3da4c9360d02dbeb.tar.zst dexon-d4f73229104ee8f12737ce5b3da4c9360d02dbeb.zip | |
Rename geth -> gdex and fix Dockerfile
Diffstat (limited to 'cmd/puppeth/module_node.go')
| -rw-r--r-- | cmd/puppeth/module_node.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 4013e7360..64f7e52e4 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -40,11 +40,11 @@ ADD genesis.json /genesis.json ADD signer.pass /signer.pass {{end}} RUN \ - echo 'geth --cache 512 init /genesis.json' > geth.sh && \{{if .Unlock}} - echo 'mkdir -p /root/.ethereum/keystore/ && cp /signer.json /root/.ethereum/keystore/' >> geth.sh && \{{end}} - echo $'exec geth --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --nat extip:{{.IP}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--miner.etherbase {{.Etherbase}} --mine --miner.threads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --miner.gastarget {{.GasTarget}} --miner.gaslimit {{.GasLimit}} --miner.gasprice {{.GasPrice}}' >> geth.sh + echo 'gdex --cache 512 init /genesis.json' > gdex.sh && \{{if .Unlock}} + echo 'mkdir -p /root/.ethereum/keystore/ && cp /signer.json /root/.ethereum/keystore/' >> gdex.sh && \{{end}} + echo $'exec gdex --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --nat extip:{{.IP}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--miner.etherbase {{.Etherbase}} --mine --miner.threads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --miner.gastarget {{.GasTarget}} --miner.gaslimit {{.GasLimit}} --miner.gasprice {{.GasPrice}}' >> gdex.sh -ENTRYPOINT ["/bin/sh", "geth.sh"] +ENTRYPOINT ["/bin/sh", "gdex.sh"] ` // nodeComposefile is the docker-compose.yml file required to deploy and maintain @@ -229,7 +229,7 @@ func checkNode(client *sshClient, network string, boot bool) (*nodeInfos, error) // Container available, retrieve its node ID and its genesis json var out []byte - if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 geth --exec admin.nodeInfo.enode --cache=16 attach", network, kind)); err != nil { + if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 gdex --exec admin.nodeInfo.id --cache=16 attach", network, kind)); err != nil { return nil, ErrServiceUnreachable } enode := bytes.Trim(bytes.TrimSpace(out), "\"") |