aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Johnson <arachnid@notdot.net>2017-09-05 21:24:09 +0800
committerGitHub <noreply@github.com>2017-09-05 21:24:09 +0800
commit03d00361f5c91bedee27e7b5853523103750de3c (patch)
tree873408a153d6793319a5ea28eec1678ea3427fb9
parentcd6c861dc567478adb64b7efef327a4aceda97f5 (diff)
parentf90a193f92e0013dc657ebe03a524a2e7286d5df (diff)
downloadgo-tangerine-03d00361f5c91bedee27e7b5853523103750de3c.tar
go-tangerine-03d00361f5c91bedee27e7b5853523103750de3c.tar.gz
go-tangerine-03d00361f5c91bedee27e7b5853523103750de3c.tar.bz2
go-tangerine-03d00361f5c91bedee27e7b5853523103750de3c.tar.lz
go-tangerine-03d00361f5c91bedee27e7b5853523103750de3c.tar.xz
go-tangerine-03d00361f5c91bedee27e7b5853523103750de3c.tar.zst
go-tangerine-03d00361f5c91bedee27e7b5853523103750de3c.zip
Merge pull request #15092 from karalabe/puppeth-main-docker-images
Dockerfile, cmd/puppeth: fix missing SSL certificates, use main image in puppeth
-rw-r--r--Dockerfile1
-rw-r--r--cmd/puppeth/module_node.go8
2 files changed, 5 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 17fa40951..eae892499 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ RUN cd /go-ethereum && make geth
# Pull Geth into a second stage deploy alpine container
FROM alpine:latest
+RUN apk add --no-cache ca-certificates
COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
EXPOSE 8545 8546 30303 30303/udp
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go
index 9fe97c892..8f912f9eb 100644
--- a/cmd/puppeth/module_node.go
+++ b/cmd/puppeth/module_node.go
@@ -30,7 +30,7 @@ import (
// nodeDockerfile is the Dockerfile required to run an Ethereum node.
var nodeDockerfile = `
-FROM ethereum/client-go:alpine-develop
+FROM ethereum/client-go:latest
ADD genesis.json /genesis.json
{{if .Unlock}}
@@ -38,9 +38,9 @@ ADD genesis.json /genesis.json
ADD signer.pass /signer.pass
{{end}}
RUN \
- echo '/geth init /genesis.json' > geth.sh && \{{if .Unlock}}
+ echo 'geth 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 .BootV4}}--bootnodesv4 {{.BootV4}}{{end}} {{if .BootV5}}--bootnodesv5 {{.BootV5}}{{end}} {{if .Etherbase}}--etherbase {{.Etherbase}} --mine{{end}}{{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --targetgaslimit {{.GasTarget}} --gasprice {{.GasPrice}}' >> geth.sh
+ echo $'geth --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .BootV4}}--bootnodesv4 {{.BootV4}}{{end}} {{if .BootV5}}--bootnodesv5 {{.BootV5}}{{end}} {{if .Etherbase}}--etherbase {{.Etherbase}} --mine{{end}}{{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --targetgaslimit {{.GasTarget}} --gasprice {{.GasPrice}}' >> geth.sh
ENTRYPOINT ["/bin/sh", "geth.sh"]
`
@@ -197,7 +197,7 @@ func checkNode(client *sshClient, network string, boot bool) (*nodeInfos, error)
// Container available, retrieve its node ID and its genesis json
var out []byte
- if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 /geth --exec admin.nodeInfo.id attach", network, kind)); err != nil {
+ if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 geth --exec admin.nodeInfo.id attach", network, kind)); err != nil {
return nil, ErrServiceUnreachable
}
id := bytes.Trim(bytes.TrimSpace(out), "\"")