aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-02-14 00:47:27 +0800
committerGitHub <noreply@github.com>2017-02-14 00:47:27 +0800
commit6988e5f0747523d2e93f0c35b9c64a66a7f5986e (patch)
tree9dc9bbeba376fac783e42fe209d6b847e023c903
parent9b161187ec130841bf4d04945cdcf45c221739fc (diff)
parent09aef5c0ae697cf41540ae7f111317448d5db0d2 (diff)
downloaddexon-6988e5f0747523d2e93f0c35b9c64a66a7f5986e.tar.gz
dexon-6988e5f0747523d2e93f0c35b9c64a66a7f5986e.tar.zst
dexon-6988e5f0747523d2e93f0c35b9c64a66a7f5986e.zip
Merge pull request #3670 from karalabe/docker-usb-fix
Dockerfile: support building USB on Alpine, ignore temp files
-rw-r--r--.dockerignore3
-rw-r--r--Dockerfile10
-rw-r--r--containers/docker/develop-alpine/Dockerfile4
-rw-r--r--containers/docker/master-alpine/Dockerfile4
4 files changed, 12 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/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