diff --git a/Dockerfile b/Dockerfile
index 00bfabe7b..1fcefc93b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,12 @@ MAINTAINER Brian Tiger Chow <btc@perfmode.com>
 ADD . /go/src/github.com/jbenet/go-ipfs
 RUN cd /go/src/github.com/jbenet/go-ipfs/cmd/ipfs && go install
 
+RUN echo -n "#!/bin/bash\nipfs init\nipfs config Addresses.API /ip4/0.0.0.0/tcp/5001\nipfs config Addresses.Gateway /ip4/0.0.0.0/tcp/8080\nipfs daemon" > /usr/local/bin/start_ipfs && \
+    chmod 755 /usr/local/bin/start_ipfs
+
 EXPOSE 4001 5001 4002/udp 8080
 
-ENTRYPOINT ["ipfs"]
-
-CMD ["daemon", "--init"]
+ENTRYPOINT ["/usr/local/bin/start_ipfs"]
 
 # build:    docker build -t go-ipfs .
 # run:      docker run -p 4001:4001 -p 5001:5001 go-ipfs:latest daemon --init