Merge pull request #3670 from karalabe/docker-usb-fix

Dockerfile: support building USB on Alpine, ignore temp files
This commit is contained in:
Péter Szilágyi 2017-02-13 18:47:27 +02:00 committed by GitHub
commit 6988e5f074
4 changed files with 12 additions and 9 deletions

3
.dockerignore Normal file

@ -0,0 +1,3 @@
.git
build/_workspace
build/_bin

@ -1,11 +1,11 @@
FROM alpine:3.3 FROM alpine:3.5
ADD . /go-ethereum ADD . /go-ethereum
RUN \ RUN \
apk add --update git go make gcc musl-dev && \ apk add --update git go make gcc musl-dev linux-headers && \
(cd go-ethereum && make geth) && \ (cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /geth && \ cp go-ethereum/build/bin/geth /geth && \
apk del git go make gcc musl-dev && \ apk del git go make gcc musl-dev linux-headers && \
rm -rf /go-ethereum && rm -rf /var/cache/apk/* rm -rf /go-ethereum && rm -rf /var/cache/apk/*
EXPOSE 8545 EXPOSE 8545

@ -1,11 +1,11 @@
FROM alpine:3.5 FROM alpine:3.5
RUN \ 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 && \ git clone --depth 1 https://github.com/ethereum/go-ethereum && \
(cd go-ethereum && make geth) && \ (cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /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/* rm -rf /go-ethereum && rm -rf /var/cache/apk/*
EXPOSE 8545 EXPOSE 8545

@ -1,11 +1,11 @@
FROM alpine:3.5 FROM alpine:3.5
RUN \ 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 && \ git clone --depth 1 --branch release/1.5 https://github.com/ethereum/go-ethereum && \
(cd go-ethereum && make geth) && \ (cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /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/* rm -rf /go-ethereum && rm -rf /var/cache/apk/*
EXPOSE 8545 EXPOSE 8545