diff --git a/Dockerfile b/Dockerfile
index eae892499750b72d1b5f449030aa285a1b39b11d..f4396fcf287d0df87479b36a7a0493eee955348a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,5 +12,5 @@ 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
+EXPOSE 8545 8546 30303 30303/udp 30304/udp
 ENTRYPOINT ["geth"]
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
new file mode 100644
index 0000000000000000000000000000000000000000..79bf0f8d56501d681dbb16eeddd29a0a62ed8a46
--- /dev/null
+++ b/Dockerfile.alltools
@@ -0,0 +1,15 @@
+# Build Geth in a stock Go builder container
+FROM golang:1.9-alpine as builder
+
+RUN apk add --no-cache make gcc musl-dev linux-headers
+
+ADD . /go-ethereum
+RUN cd /go-ethereum && make all
+
+# Pull all binaries into a second stage deploy alpine container
+FROM alpine:latest
+
+RUN apk add --no-cache ca-certificates
+COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
+
+EXPOSE 8545 8546 30303 30303/udp 30304/udp