aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Johnson <arachnid@notdot.net>2016-11-16 01:57:56 +0800
committerNick Johnson <arachnid@notdot.net>2016-11-16 01:57:56 +0800
commit504815091fc8339cd06003e6394408a7a5738ebd (patch)
tree2130701aec2891f6423a009d0151e86a84c22d36
parent4dd3e7fe3590b03851f6c4eab40a581de0fceb70 (diff)
downloaddexon-504815091fc8339cd06003e6394408a7a5738ebd.tar
dexon-504815091fc8339cd06003e6394408a7a5738ebd.tar.gz
dexon-504815091fc8339cd06003e6394408a7a5738ebd.tar.bz2
dexon-504815091fc8339cd06003e6394408a7a5738ebd.tar.lz
dexon-504815091fc8339cd06003e6394408a7a5738ebd.tar.xz
dexon-504815091fc8339cd06003e6394408a7a5738ebd.tar.zst
dexon-504815091fc8339cd06003e6394408a7a5738ebd.zip
containers/docker: Fix dockerfiles for new branch layout; add dockerfile in root
-rw-r--r--Dockerfile14
-rw-r--r--containers/docker/develop-alpine/Dockerfile2
-rw-r--r--containers/docker/master-alpine/Dockerfile2
3 files changed, 16 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..2d35c0141
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM alpine:3.3
+
+ADD . /go-ethereum
+RUN \
+ apk add --update go make gcc musl-dev && \
+ (cd go-ethereum && make geth) && \
+ cp go-ethereum/build/bin/geth /geth && \
+ apk del go make gcc musl-dev && \
+ rm -rf /go-ethereum && rm -rf /var/cache/apk/*
+
+EXPOSE 8545
+EXPOSE 30303
+
+ENTRYPOINT ["/geth"]
diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile
index f3247d178..3393c4337 100644
--- a/containers/docker/develop-alpine/Dockerfile
+++ b/containers/docker/develop-alpine/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.4
RUN \
apk add --update go git make gcc musl-dev && \
- git clone --depth 1 --branch develop https://github.com/ethereum/go-ethereum && \
+ 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 && \
diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile
index 3393c4337..5131c473a 100644
--- a/containers/docker/master-alpine/Dockerfile
+++ b/containers/docker/master-alpine/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.4
RUN \
apk add --update go git make gcc musl-dev && \
- git clone --depth 1 https://github.com/ethereum/go-ethereum && \
+ 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 && \