diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-08-03 18:26:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 18:26:39 +0800 |
| commit | 35fcd2f42388d10c2c638dd3e2b4bd4306b07c19 (patch) | |
| tree | a94ab3b5b276b671d6807d190ca54528101f8b94 /cmd/puppeth/module_node.go | |
| parent | 51db5975cc5fb88db6a0dba1826b534fd4df29d7 (diff) | |
| parent | faf0e06ed8ffbf3a938312724c8cf722b1132d15 (diff) | |
| download | go-tangerine-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.tar go-tangerine-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.tar.gz go-tangerine-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.tar.bz2 go-tangerine-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.tar.lz go-tangerine-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.tar.xz go-tangerine-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.tar.zst go-tangerine-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.zip | |
Merge pull request #17311 from karalabe/puppeth-graceful-stop
cmd/puppeth: graceful shutdown on redeploys
Diffstat (limited to 'cmd/puppeth/module_node.go')
| -rw-r--r-- | cmd/puppeth/module_node.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 34377733f..a480a894e 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -42,7 +42,7 @@ ADD genesis.json /genesis.json 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 $'geth --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--etherbase {{.Etherbase}} --mine --minerthreads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --targetgaslimit {{.GasTarget}} --gasprice {{.GasPrice}}' >> geth.sh + echo $'exec geth --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--etherbase {{.Etherbase}} --mine --minerthreads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --targetgaslimit {{.GasTarget}} --gasprice {{.GasPrice}}' >> geth.sh ENTRYPOINT ["/bin/sh", "geth.sh"] ` @@ -139,9 +139,9 @@ func deployNode(client *sshClient, network string, bootnodes []string, config *n // Build and deploy the boot or seal node service if nocache { - return nil, client.Stream(fmt.Sprintf("cd %s && docker-compose -p %s build --pull --no-cache && docker-compose -p %s up -d --force-recreate", workdir, network, network)) + return nil, client.Stream(fmt.Sprintf("cd %s && docker-compose -p %s build --pull --no-cache && docker-compose -p %s up -d --force-recreate --timeout 60", workdir, network, network)) } - return nil, client.Stream(fmt.Sprintf("cd %s && docker-compose -p %s up -d --build --force-recreate", workdir, network)) + return nil, client.Stream(fmt.Sprintf("cd %s && docker-compose -p %s up -d --build --force-recreate --timeout 60", workdir, network)) } // nodeInfos is returned from a boot or seal node status check to allow reporting |