Merge 433cebed63
into 6320f15a7c
This commit is contained in:
commit
e24706263e
24
Dockerfile
24
Dockerfile
@ -1,17 +1,21 @@
|
|||||||
FROM golang:1.8
|
FROM golang:1.8 as frpBuild
|
||||||
|
|
||||||
COPY . /go/src/github.com/fatedier/frp
|
COPY . /go/src/github.com/fatedier/frp
|
||||||
|
|
||||||
RUN cd /go/src/github.com/fatedier/frp \
|
ENV CGO_ENABLED=0
|
||||||
&& make \
|
|
||||||
&& mv bin/frpc /frpc \
|
|
||||||
&& mv bin/frps /frps \
|
|
||||||
&& mv conf/frpc.ini /frpc.ini \
|
|
||||||
&& mv conf/frps.ini /frps.ini \
|
|
||||||
&& make clean
|
|
||||||
|
|
||||||
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
|
EXPOSE 80 443 6000 7000 7500
|
||||||
|
|
||||||
ENTRYPOINT ["/frps"]
|
WORKDIR /
|
||||||
|
|
||||||
|
CMD ["/frps","-c","frps.ini"]
|
@ -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"]
|
|
Loading…
Reference in New Issue
Block a user