From fecd7463c91c979bfa9bdad441cd1f016a8ca6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BF=97=E8=81=AA?= <oneisall8955@gmail.com>
Date: Wed, 21 Feb 2024 16:25:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=B7=AF=E5=BE=84=20(#12?=
 =?UTF-8?q?8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: liuzhicong <liuzhicong@dhgate.com>
---
 README.md | 2 +-
 deploy.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9924736..d553009 100644
--- a/README.md
+++ b/README.md
@@ -395,7 +395,7 @@ services:
       - ./data/zerotier/dist:/app/dist
       - ./data/zerotier/ztncui:/app/ztncui
       - ./data/zerotier/one:/var/lib/zerotier-one
-      - ./data/config:/app/config
+      - ./data/zerotier/config:/app/config
     restart: unless-stopped
 
 ```
diff --git a/deploy.sh b/deploy.sh
index 53a89e8..76ef598 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -230,7 +230,7 @@ uninstall() {
 #         -v $(pwd)/data/zerotier/dist:/app/dist \
 #         -v $(pwd)/data/zerotier/ztncui:/app/ztncui \
 #         -v $(pwd)/data/zerotier/one:/var/lib/zerotier-one \
-#         -v $(pwd)/data/config:/app/config \
+#         -v $(pwd)/data/zerotier/config:/app/config \
 #         --restart unless-stopped \
 #         xubiaolin/zerotier-planet:latest
 # }

From 8c78edc441d3311e6f41f96ed9e13f974719e811 Mon Sep 17 00:00:00 2001
From: root <root@xubiaolin-r5>
Date: Sat, 24 Feb 2024 00:16:08 +0800
Subject: [PATCH 2/2] addbuildtag

---
 Dockerfile | 4 ++++
 build.sh   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9dbef4c..1a00443 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,8 @@
 FROM alpine:3.14 as builder
 
 ENV TZ=Asia/Shanghai
+ARG TAG=main
+ENV TAG=${TAG}
 
 WORKDIR /app
 ADD ./entrypoint.sh /app/entrypoint.sh
@@ -19,6 +21,8 @@ RUN set -x\
     && source "$HOME/.cargo/env"\
     && git clone https://github.com/zerotier/ZeroTierOne.git\
     && cd ZeroTierOne\
+    && git checkout ${TAG}\
+    && echo "切换到tag:${TAG}"\
     && make ZT_SYMLINK=1 \
     && make\
     && make install\
diff --git a/build.sh b/build.sh
index 41efcb6..ef64dd8 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -t xubiaolin/zerotier-planet:latest .
\ No newline at end of file
+docker build --build-arg TAG=1.12.2 -t xubiaolin/zerotier-planet:latest .
\ No newline at end of file