diff --git a/frpc.dockerfile b/frpc.dockerfile index aafbc65..44f5d20 100644 --- a/frpc.dockerfile +++ b/frpc.dockerfile @@ -25,4 +25,6 @@ RUN cd /root \ && rm frp_${FRP_VERSION}_linux_amd64.tar.gz \ && rm -rf frp_${FRP_VERSION}_linux_amd64/ -ENTRYPOINT if [ -d /app ]; then cd /app && openresty -p /app; fi; /usr/bin/frpc -c /etc/frp/frpc.toml \ No newline at end of file +ENTRYPOINT if [ -d /app ]; then cd /app && openresty -p /app; fi; /usr/bin/frpc -c /etc/frp/frpc.toml + +# docker build --progress=tty -f frpc.dockerfile -t frp-by1.wwvvww.cn:45288/frpc:0.60.0 . \ No newline at end of file diff --git a/resources/build.sh b/resources/build.sh index e26312f..1f26c88 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -18,6 +18,10 @@ function build() { elif [[ $DOCKERFILE == *"ubuntu1604.dockerfile" ]]; then docker build -f $DOCKERFILE -t frp-by1.wwvvww.cn:45288/ubuntu_dev:16.04 . docker push frp-by1.wwvvww.cn:45288/ubuntu_dev:16.04 + elif [[ $DOCKERFILE == *"frpc.dockerfile" ]]; then + FRP_VERSION=$(grep 'ENV FRP_VERSION' frpc.dockerfile | awk '{print $3}') + docker build -f $DOCKERFILE -t frp-by1.wwvvww.cn:45288/frpc:$FRP_VERSION . + docker push frp-by1.wwvvww.cn:45288/frpc:$FRP_VERSION else echo "not found steps for build $DOCKERFILE ..." fi