From ac4537e247925c5aa0b0d36fc580ffe65e2d5416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=87=A1=E8=BF=AA?= <541832074@qq.com> Date: Mon, 4 Sep 2017 16:00:41 +0800 Subject: [PATCH] fix typo of Docker and remove useless duplicate docker file --- Dockerfile | 2 +- Dockerfile_alpine | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 Dockerfile_alpine diff --git a/Dockerfile b/Dockerfile index 7050143b..288fe55f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ 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/frpc / +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 diff --git a/Dockerfile_alpine b/Dockerfile_alpine deleted file mode 100644 index fed73312..00000000 --- a/Dockerfile_alpine +++ /dev/null @@ -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"]