diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-04-10 18:40:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 18:40:52 +0800 |
| commit | 149f706fdee89877efd6ca6e168a9a20aaf61a0c (patch) | |
| tree | 4a97ceaadaead45f05927ef8f5c1f73a930e056e | |
| parent | 39f4c80155b891643b098f99edd0e630e16a5f99 (diff) | |
| parent | 7c1e9a5004c61ee6ec4636fd1926fafa0ae6a940 (diff) | |
| download | dexon-149f706fdee89877efd6ca6e168a9a20aaf61a0c.tar.gz dexon-149f706fdee89877efd6ca6e168a9a20aaf61a0c.tar.zst dexon-149f706fdee89877efd6ca6e168a9a20aaf61a0c.zip | |
Merge pull request #16477 from karalabe/puppeth-dockerfile-permission-fix
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 2609fd976..49c099112 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 $'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 '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 -ENTRYPOINT ["/bin/sh", "geth.sh"] +ENTRYPOINT ["/bin/sh", "/root/geth.sh"] ` // nodeComposefile is the docker-compose.yml file required to deploy and maintain |