fix Dockerfile use multi-stage builds remove duplicate docker file Dockerfile_alpine

This commit is contained in:
袁凡迪 2017-09-05 22:15:40 +08:00
parent 6320f15a7c
commit 896c2a1d6e
2 changed files with 14 additions and 22 deletions

View File

@ -1,17 +1,21 @@
FROM golang:1.8
FROM golang:1.8 as frpBuild
COPY . /go/src/github.com/fatedier/frp
RUN cd /go/src/github.com/fatedier/frp \
&& make \
&& mv bin/frpc /frpc \
&& mv bin/frps /frps \
&& mv conf/frpc.ini /frpc.ini \
&& mv conf/frps.ini /frps.ini \
&& make clean
ENV CGO_ENABLED=0
WORKDIR /
RUN cd /go/src/github.com/fatedier/frp \
&& make
FROM alpine:3.6
COPY --from=frpBuild /go/src/github.com/fatedier/frp/bin/frpc /
COPY --from=frpBuild /go/src/github.com/fatedier/frp/conf/frpc.ini /
COPY --from=frpBuild /go/src/github.com/fatedier/frp/bin/frps /
COPY --from=frpBuild /go/src/github.com/fatedier/frp/conf/frps.ini /
EXPOSE 80 443 6000 7000 7500
ENTRYPOINT ["/frps"]
WORKDIR /
CMD ["/frps","-c","frps.ini"]

View File

@ -1,12 +0,0 @@
FROM alpine:3.5
COPY tmp/frpc /frpc
COPY tmp/frps /frps
COPY conf/frpc_min.ini /frpc.ini
COPY conf/frps_min.ini /frps.ini
WORKDIR /
EXPOSE 80 443 6000 7000 7500
ENTRYPOINT ["/frps"]