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_wallet.go | |
| parent | 51db5975cc5fb88db6a0dba1826b534fd4df29d7 (diff) | |
| parent | faf0e06ed8ffbf3a938312724c8cf722b1132d15 (diff) | |
| download | dexon-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.tar.gz dexon-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.tar.zst dexon-35fcd2f42388d10c2c638dd3e2b4bd4306b07c19.zip | |
Merge pull request #17311 from karalabe/puppeth-graceful-stop
cmd/puppeth: graceful shutdown on redeploys
Diffstat (limited to 'cmd/puppeth/module_wallet.go')
| -rw-r--r-- | cmd/puppeth/module_wallet.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 5e5032bed..90812c4a0 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -37,7 +37,7 @@ ADD genesis.json /genesis.json RUN \ echo 'node server.js &' > wallet.sh && \ echo 'geth --cache 512 init /genesis.json' >> wallet.sh && \ - echo $'geth --networkid {{.NetworkID}} --port {{.NodePort}} --bootnodes {{.Bootnodes}} --ethstats \'{{.Ethstats}}\' --cache=512 --rpc --rpcaddr=0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*"' >> wallet.sh + echo $'exec geth --networkid {{.NetworkID}} --port {{.NodePort}} --bootnodes {{.Bootnodes}} --ethstats \'{{.Ethstats}}\' --cache=512 --rpc --rpcaddr=0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*"' >> wallet.sh RUN \ sed -i 's/PuppethNetworkID/{{.NetworkID}}/g' dist/js/etherwallet-master.js && \ @@ -120,9 +120,9 @@ func deployWallet(client *sshClient, network string, bootnodes []string, config // 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)) } // walletInfos is returned from a web wallet status check to allow reporting |