From 36fe815e35e40195558d4427a1c0df4659ecb1ea Mon Sep 17 00:00:00 2001
From: WJQSERVER <114663932+WJQSERVER@users.noreply.github.com>
Date: Mon, 20 Jan 2025 10:53:05 +0800
Subject: [PATCH] v2.0.1 (#34)

---
 CHANGELOG.md                      | 10 ++++++++++
 DEV-VERSION                       |  2 +-
 VERSION                           |  2 +-
 docker/dockerfile/release/init.sh |  6 ------
 init.sh                           |  6 ------
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3e0f0d..8e2fde1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # 更新日志
 
+v2.0.1
+---
+- RELEASE: v2.0.1正式版发布; 此版本是v2.0.0的小修复版本, 主要修复了Docker启动脚本存在的一些问题
+- FIX: 修复Docker启动脚本存在的一些问题
+
+25w05a
+---
+- PRE-RELEASE: 此版本是v2.0.1的候选版本,请勿在生产环境中使用;
+- FIX: 修复Docker启动脚本存在的一些问题
+
 2.0.0
 ---
 - RELEASE: v2.0.0正式版发布; 此版本圆了几个月前画的饼, 在大文件下载的内存占用方面做出了巨大改进
diff --git a/DEV-VERSION b/DEV-VERSION
index bd1becd..b24a084 100644
--- a/DEV-VERSION
+++ b/DEV-VERSION
@@ -1 +1 @@
-25w04c
\ No newline at end of file
+25w05a
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 359a5b9..10bf840 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
\ No newline at end of file
+2.0.1
\ No newline at end of file
diff --git a/docker/dockerfile/release/init.sh b/docker/dockerfile/release/init.sh
index 66d65c6..0555c6f 100644
--- a/docker/dockerfile/release/init.sh
+++ b/docker/dockerfile/release/init.sh
@@ -2,10 +2,6 @@
 
 APPLICATION=ghproxy
 
-if [ ! -f /data/caddy/config/Caddyfile ]; then
-    cp /data/caddy/Caddyfile /data/caddy/config/Caddyfile
-fi
-
 if [ ! -f /data/${APPLICATION}/config/blacklist.json ]; then
     cp /data/${APPLICATION}/blacklist.json /data/${APPLICATION}/config/blacklist.json
 fi
@@ -18,8 +14,6 @@ if [ ! -f /data/${APPLICATION}/config/config.toml ]; then
     cp /data/${APPLICATION}/config.toml /data/${APPLICATION}/config/config.toml
 fi
 
-/data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATION}/log/caddy.log 2>&1 &
-
 /data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 &
 
 sleep 30
diff --git a/init.sh b/init.sh
index ce3bc05..70da645 100644
--- a/init.sh
+++ b/init.sh
@@ -2,10 +2,6 @@
 
 APPLICATON=ghproxy
 
-if [ ! -f /data/caddy/config/Caddyfile ]; then
-    cp /data/caddy/Caddyfile /data/caddy/config/Caddyfile
-fi
-
 if [ ! -f /data/${APPLICATON}/config/blacklist.json ]; then
     cp /data/${APPLICATON}/blacklist.json /data/${APPLICATON}/config/blacklist.json
 fi
@@ -18,8 +14,6 @@ if [ ! -f /data/${APPLICATON}/config/config.yaml ]; then
     cp /data/${APPLICATON}/config.yaml /data/${APPLICATON}/config/config.yaml
 fi
 
-/data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATON}/log/caddy.log 2>&1 &
-
 /data/${APPLICATON}/${APPLICATON} > /data/${APPLICATON}/log/run.log 2>&1 &
 
 sleep 30