diff options
| -rw-r--r-- | .dockerignore | 3 | ||||
| -rw-r--r-- | Dockerfile | 10 | ||||
| -rw-r--r-- | cmd/swarm/main.go | 10 | ||||
| -rw-r--r-- | containers/docker/develop-alpine/Dockerfile | 4 | ||||
| -rw-r--r-- | containers/docker/master-alpine/Dockerfile | 4 |
5 files changed, 22 insertions, 9 deletions
diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..d1d79d53e --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.git +build/_workspace +build/_bin diff --git a/Dockerfile b/Dockerfile index f24506f69..ae6870e31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM alpine:3.3 +FROM alpine:3.5 ADD . /go-ethereum RUN \ - apk add --update git go make gcc musl-dev && \ - (cd go-ethereum && make geth) && \ - cp go-ethereum/build/bin/geth /geth && \ - apk del git go make gcc musl-dev && \ + apk add --update git go make gcc musl-dev linux-headers && \ + (cd go-ethereum && make geth) && \ + cp go-ethereum/build/bin/geth /geth && \ + apk del git go make gcc musl-dev linux-headers && \ rm -rf /go-ethereum && rm -rf /var/cache/apk/* EXPOSE 8545 diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 14adc3b10..5661b3f6e 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -21,9 +21,11 @@ import ( "fmt" "io/ioutil" "os" + "os/signal" "runtime" "strconv" "strings" + "syscall" "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts/keystore" @@ -271,6 +273,14 @@ func bzzd(ctx *cli.Context) error { stack := utils.MakeNode(ctx, clientIdentifier, gitCommit) registerBzzService(ctx, stack) utils.StartNode(stack) + go func() { + sigc := make(chan os.Signal, 1) + signal.Notify(sigc, syscall.SIGTERM) + defer signal.Stop(sigc) + <-sigc + glog.V(logger.Info).Infoln("Got sigterm, shutting down...") + stack.Stop() + }() networkId := ctx.GlobalUint64(SwarmNetworkIdFlag.Name) // Add bootnodes as initial peers. if ctx.GlobalIsSet(utils.BootnodesFlag.Name) { diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index a8d85bc63..d239129d5 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -1,11 +1,11 @@ FROM alpine:3.5 RUN \ - apk add --update go git make gcc musl-dev ca-certificates && \ + apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ git clone --depth 1 https://github.com/ethereum/go-ethereum && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ - apk del go git make gcc musl-dev && \ + apk del go git make gcc musl-dev linux-headers && \ rm -rf /go-ethereum && rm -rf /var/cache/apk/* EXPOSE 8545 diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index 0db583a43..3c72bc8c8 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -1,11 +1,11 @@ FROM alpine:3.5 RUN \ - apk add --update go git make gcc musl-dev ca-certificates && \ + apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ git clone --depth 1 --branch release/1.5 https://github.com/ethereum/go-ethereum && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ - apk del go git make gcc musl-dev && \ + apk del go git make gcc musl-dev linux-headers && \ rm -rf /go-ethereum && rm -rf /var/cache/apk/* EXPOSE 8545 |