Skip to content

Commit 6988e5f

Browse files
authored
Merge pull request ethereum#3670 from karalabe/docker-usb-fix
Dockerfile: support building USB on Alpine, ignore temp files
2 parents 9b16118 + 09aef5c commit 6988e5f

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.git
2+
build/_workspace
3+
build/_bin

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM alpine:3.3
1+
FROM alpine:3.5
22

33
ADD . /go-ethereum
44
RUN \
5-
apk add --update git go make gcc musl-dev && \
6-
(cd go-ethereum && make geth) && \
7-
cp go-ethereum/build/bin/geth /geth && \
8-
apk del git go make gcc musl-dev && \
5+
apk add --update git go make gcc musl-dev linux-headers && \
6+
(cd go-ethereum && make geth) && \
7+
cp go-ethereum/build/bin/geth /geth && \
8+
apk del git go make gcc musl-dev linux-headers && \
99
rm -rf /go-ethereum && rm -rf /var/cache/apk/*
1010

1111
EXPOSE 8545

containers/docker/develop-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
FROM alpine:3.5
22

33
RUN \
4-
apk add --update go git make gcc musl-dev ca-certificates && \
4+
apk add --update go git make gcc musl-dev linux-headers ca-certificates && \
55
git clone --depth 1 https://github.com/ethereum/go-ethereum && \
66
(cd go-ethereum && make geth) && \
77
cp go-ethereum/build/bin/geth /geth && \
8-
apk del go git make gcc musl-dev && \
8+
apk del go git make gcc musl-dev linux-headers && \
99
rm -rf /go-ethereum && rm -rf /var/cache/apk/*
1010

1111
EXPOSE 8545

containers/docker/master-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
FROM alpine:3.5
22

33
RUN \
4-
apk add --update go git make gcc musl-dev ca-certificates && \
4+
apk add --update go git make gcc musl-dev linux-headers ca-certificates && \
55
git clone --depth 1 --branch release/1.5 https://github.com/ethereum/go-ethereum && \
66
(cd go-ethereum && make geth) && \
77
cp go-ethereum/build/bin/geth /geth && \
8-
apk del go git make gcc musl-dev && \
8+
apk del go git make gcc musl-dev linux-headers && \
99
rm -rf /go-ethereum && rm -rf /var/cache/apk/*
1010

1111
EXPOSE 8545

0 commit comments

Comments
 (0)