diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-04-23 20:24:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 20:24:17 +0800 |
| commit | 7d2c730acb63a5faeb74363ffa684dbfee6c3c01 (patch) | |
| tree | 03021f2fa5adb41adccdcee58af0ab4cf5a30058 | |
| parent | 4f91831aec2b152a014d42c72bb09b5da791b334 (diff) | |
| parent | abd881f6d4ebc3ee731ff72a963fd1748b3cbc82 (diff) | |
| download | dexon-7d2c730acb63a5faeb74363ffa684dbfee6c3c01.tar dexon-7d2c730acb63a5faeb74363ffa684dbfee6c3c01.tar.gz dexon-7d2c730acb63a5faeb74363ffa684dbfee6c3c01.tar.bz2 dexon-7d2c730acb63a5faeb74363ffa684dbfee6c3c01.tar.lz dexon-7d2c730acb63a5faeb74363ffa684dbfee6c3c01.tar.xz dexon-7d2c730acb63a5faeb74363ffa684dbfee6c3c01.tar.zst dexon-7d2c730acb63a5faeb74363ffa684dbfee6c3c01.zip | |
Merge pull request #16551 from ethereum/revert-16477-puppeth-dockerfile-permission-fix
Revert "cmd/puppeth: fix node deploys for updated dockerfile user"
| -rw-r--r-- | cmd/puppeth/module_node.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 3c70dbb4f..1e1767c04 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' > /root/geth.sh && \{{if .Unlock}} - echo 'mkdir -p /root/.ethereum/keystore/ && cp /signer.json /root/.ethereum/keystore/' >> /root/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}}' >> /root/geth.sh + 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 -ENTRYPOINT ["/bin/sh", "/root/geth.sh"] +ENTRYPOINT ["/bin/sh", "geth.sh"] ` // nodeComposefile is the docker-compose.yml file required to deploy and maintain |