aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2018-04-10 18:40:52 +0800
committerGitHub <noreply@github.com>2018-04-10 18:40:52 +0800
commit149f706fdee89877efd6ca6e168a9a20aaf61a0c (patch)
tree4a97ceaadaead45f05927ef8f5c1f73a930e056e
parent39f4c80155b891643b098f99edd0e630e16a5f99 (diff)
parent7c1e9a5004c61ee6ec4636fd1926fafa0ae6a940 (diff)
downloadgo-tangerine-149f706fdee89877efd6ca6e168a9a20aaf61a0c.tar.gz
go-tangerine-149f706fdee89877efd6ca6e168a9a20aaf61a0c.tar.zst
go-tangerine-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.go8
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
/span>/+1 * - Update to 2.4.0culot2011-04-263-14/+3 * - Update to 2.3.5dhn2011-04-122-3/+3 * Add a new macro to deal with conflict between ncurses from base and ncurses f...bapt2011-04-111-4/+1 * - Update to 2.3.4miwi2011-02-142-6/+5 * Switch to audio/musepack from deprecated audio/libmpcdecmakc2010-09-222-2/+13 * Chase multimedia/mp4v2 update.makc2010-08-121-2/+2 * - Update ffmpeg to 0.6mm2010-07-251-0/+1 * - Update to 2.3.3sylvio2010-06-303-16/+5 * Bump PORTREVISION after libao update and handle API incompatibility.naddy2010-06-072-1/+11 * Chase audio/libmodplug updateehaupt2010-05-281-1/+1 * - Chase wavpack's lib dumpsylvio2010-04-101-0/+1 * Update cmus to 2.3.1, add Pulseaudio support.lx2010-03-194-11/+20 * Bump PORTREVISION after libogg and libvorbisfile major version increment.naddy2009-07-071-1/+1 * - Chase audio/faad shlib bumpmiwi2009-02-211-1/+1 * Update to FLAC 1.2.1. This version includes two and a half yearsnaddy2008-04-081-1/+1 * - Remove the DESTDIR modifications from individual ports as we have a new,gabor2007-08-041-1/+1 * - Add ffmpeg knopmiwi2007-08-032-1/+13 * - Update to 2.2.0pav2007-07-303-8/+19 * - Chase increase of audio/libvorbis shlib version.miwi2007-07-281-1/+1 * - Set --mandir and --infodir in CONFIGURE_ARGS if the configure scriptrafan2007-07-231-1/+1 * - ncursesw is in newer 6.x and 7.x use that instead of port's versionrafan2007-04-081-4/+2 * - Wide-character supportsat2007-03-041-4/+6 * - Update to 2.1.0clsung2006-12-234-26/+45 * - Update to 2.0.4rafan2006-08-232-6/+7 * - EXAMPLESDIR is not controlled by NOPORTDOCSrafan2006-08-212-12/+13 * Update to 2.0.3, and make it OPTIONS-tastic. Also removesadamw2006-08-114-72/+62 * Update to 2.0.2.adamw2006-08-093-5/+21 * Transfer maintainership to simon@olofsson.deadamw2006-08-091-1/+1 * Chase audio/libmodplug update.ehaupt2006-04-261-1/+1 * Update to 2.0.0. Add another MASTER_SITE, and add libao support.adamw2006-04-07