From 7d7a09d44aaf60b7bbdc4aa3bfb21c0a1d0718fe Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sun, 22 Feb 2015 12:02:57 +0100 Subject: [PATCH 1/5] Fix: IPFS needs golang:1.4 to build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 19f97c52d..7f168e2fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.3 +FROM golang:1.4 MAINTAINER Brian Tiger Chow ADD . /go/src/github.com/jbenet/go-ipfs From f6e37309082817ed7bba71a2a01609b1dd05ce00 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sun, 22 Feb 2015 23:02:05 +0100 Subject: [PATCH 2/5] HTTP transport is listening on port 8080 by default --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f168e2fb..00bfabe7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Brian Tiger Chow ADD . /go/src/github.com/jbenet/go-ipfs RUN cd /go/src/github.com/jbenet/go-ipfs/cmd/ipfs && go install -EXPOSE 4001 5001 4002/udp +EXPOSE 4001 5001 4002/udp 8080 ENTRYPOINT ["ipfs"] From 0eef12a07b30946f1bc1699e7a49a4aca0484262 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sun, 22 Feb 2015 23:27:25 +0100 Subject: [PATCH 3/5] Added boot script to listen on 0.0.0.0 --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00bfabe7b..1fcefc93b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,12 @@ MAINTAINER Brian Tiger Chow 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 From 382697004b8db81741fbf6851eecd76b0bac1be4 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sun, 22 Feb 2015 23:34:27 +0100 Subject: [PATCH 4/5] Removed 4002/udp for now, fixed start commands --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1fcefc93b..f79a42482 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,11 @@ 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 +EXPOSE 4001 5001 8080 +# 4001 = Swarm, 5001 = API, 8080 = HTTP transport 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 -# run: docker run -p 4002:4002/udp -p 4001:4001 -p 5001:5001 go-ipfs:latest daemon --init +# run: docker run -p 4001:4001 -p 5001:5001 go-ipfs:latest +# run: docker run -p 8080:8080 -p 4001:4001 -p 5001:5001 go-ipfs:latest From ab28018f8c8d6522a8428db14aa8df53ddf1aeed Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Mon, 23 Feb 2015 00:08:15 +0100 Subject: [PATCH 5/5] Moved the container startup script to bin --- Dockerfile | 2 +- bin/container_daemon | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 bin/container_daemon diff --git a/Dockerfile b/Dockerfile index f79a42482..eccce0732 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Brian Tiger Chow 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 && \ +RUN cp /go/src/github.com/jbenet/go-ipfs/bin/container_daemon /usr/local/bin/start_ipfs && \ chmod 755 /usr/local/bin/start_ipfs EXPOSE 4001 5001 8080 diff --git a/bin/container_daemon b/bin/container_daemon new file mode 100644 index 000000000..2e146035b --- /dev/null +++ b/bin/container_daemon @@ -0,0 +1,5 @@ +#!/bin/bash +ipfs init +ipfs config Addresses.API /ip4/0.0.0.0/tcp/5001 +ipfs config Addresses.Gateway /ip4/0.0.0.0/tcp/8080 +ipfs daemon