From 9c2dd8bf0116cd4fb09eb15005ff05090dc02caa Mon Sep 17 00:00:00 2001
From: amass <168062547@qq.com>
Date: Thu, 17 Oct 2024 23:38:50 +0800
Subject: [PATCH] correct frpc build ci.

---
 frpc.dockerfile        | 2 +-
 resources/build.sh     | 2 +-
 wwooww_frpc.dockerfile | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frpc.dockerfile b/frpc.dockerfile
index 44f5d20..bad1e33 100644
--- a/frpc.dockerfile
+++ b/frpc.dockerfile
@@ -27,4 +27,4 @@ RUN cd /root \
 
 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
+# docker build --progress=tty -f frpc.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:0.60.0 .
\ No newline at end of file
diff --git a/resources/build.sh b/resources/build.sh
index 913235f..1a9c9b7 100755
--- a/resources/build.sh
+++ b/resources/build.sh
@@ -20,7 +20,7 @@ function build() {
         docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04 .
         docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04
     elif [[ $DOCKERFILE == *"frpc.dockerfile" ]]; then
-        FRP_VERSION=$(grep 'ENV FRP_VERSION' frpc.dockerfile | awk '{print $3}')
+        FRP_VERSION=$(grep 'ENV FRP_VERSION' $DOCKERFILE | awk '{print $3}')
         docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION .
         docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION
     else
diff --git a/wwooww_frpc.dockerfile b/wwooww_frpc.dockerfile
index 335e896..50f67c4 100644
--- a/wwooww_frpc.dockerfile
+++ b/wwooww_frpc.dockerfile
@@ -26,3 +26,5 @@ RUN cd /root \
     && 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.ini
+
+# docker build --progress=tty -f wwooww_frpc.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:0.49.0 .