From def3645c9a898cbf02fa4d1d8e6bbbf317421d06 Mon Sep 17 00:00:00 2001
From: "xiaobing.wang" <xiaobing.wang@chaitin.com>
Date: Thu, 6 Jun 2024 16:07:28 +0800
Subject: [PATCH] feat: 6.0.3

---
 CHANGELOG.md                            | 10 ++++++++++
 documents/docs/06-about/00-changelog.md | 11 +++++++++++
 release/latest/compose.yaml             |  5 +++--
 release/latest/upgrade.sh               |  3 +++
 release/latest/version.json             |  4 ++--
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c724eb1..c73a021 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # SAFELINE-CE CHANGELOG
 
+## [6.0.3] - 2024-06-06
+
+### 优化
+* 修复动态防护在观察模式下仍然生效的问题
+* 修复响应码不为 200 的请求，也会采集进资源的问题
+* 修复自定义规则中，路径匹配条件未包括参数的问题
+* 修复使用动态防护时 23333 端口被占用的问题
+* 修复动态防护选择防护资源时的一些交互细节问题
+* 优化其他一些 UI 交互细节
+
 ## [6.0.2] - 2024-06-03
 
 ### 优化
diff --git a/documents/docs/06-about/00-changelog.md b/documents/docs/06-about/00-changelog.md
index c336a2d..eabdf69 100644
--- a/documents/docs/06-about/00-changelog.md
+++ b/documents/docs/06-about/00-changelog.md
@@ -6,6 +6,17 @@ title: "版本更新记录"
 
 [版本升级方法](/guide/upgrade)
 
+### [6.0.3] - 2024-06-06
+
+#### 优化
+* 修复动态防护在观察模式下仍然生效的问题
+* 修复响应码不为 200 的请求，也会采集进资源的问题
+* 修复自定义规则中，路径匹配条件未包括参数的问题
+* 修复使用动态防护时 23333 端口被占用的问题
+* 修复动态防护选择防护资源时的一些交互细节问题
+* 优化其他一些 UI 交互细节
+
+
 ### [6.0.2] - 2024-06-03
 
 #### 优化
diff --git a/release/latest/compose.yaml b/release/latest/compose.yaml
index 42ca33c..9c39764 100644
--- a/release/latest/compose.yaml
+++ b/release/latest/compose.yaml
@@ -91,6 +91,7 @@ services:
       - /etc/resolv.conf:/etc/resolv.conf:ro
       - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
       - ${SAFELINE_DIR}/resources/detector:/resources/detector
+      - ${SAFELINE_DIR}/resources/chaos:/resources/chaos
       - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
       - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     environment:
@@ -164,8 +165,8 @@ services:
       options:
         max-size: "100m"
         max-file: "10"
-    ports:
-      - 23333:23333
+    volumes:
+      - ${SAFELINE_DIR}/resources/chaos:/app/chaos
     networks:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.10
\ No newline at end of file
diff --git a/release/latest/upgrade.sh b/release/latest/upgrade.sh
index 1f8057f..d0fa56b 100755
--- a/release/latest/upgrade.sh
+++ b/release/latest/upgrade.sh
@@ -209,6 +209,7 @@ curl "https://waf-ce.chaitin.cn/release/latest/compose.yaml" -sSLk -o $compose_n
 curl "https://waf-ce.chaitin.cn/release/latest/reset_tengine.sh" -sSLk -o reset_tengine.sh
 
 if [ $? -ne "0" ]; then
+    mv $compose_name.old $compose_name || true
     abort "下载 compose.yaml 脚本失败"
 fi
 info "下载 compose.yaml 脚本成功"
@@ -250,6 +251,7 @@ info "即将开始下载新版本 Docker 镜像"
 
 $compose_command pull
 if [ $? -ne "0" ]; then
+    mv $compose_name.old $compose_name || true
     abort "下载新版本 Docker 镜像失败"
 fi
 info "下载新版本 Docker 镜像成功"
@@ -261,6 +263,7 @@ docker rm -f safeline-redis &>/dev/null
 
 $compose_command down --remove-orphans && $compose_command up -d
 if [ $? -ne "0" ]; then
+    mv $compose_name.old $compose_name || true
     abort "替换 Docker 容器失败"
 fi
 
diff --git a/release/latest/version.json b/release/latest/version.json
index d09fa39..c745f5c 100644
--- a/release/latest/version.json
+++ b/release/latest/version.json
@@ -1,4 +1,4 @@
 {
-  "latest_version": "v6.0.2",
-  "rec_version": "v6.0.2"
+  "latest_version": "v6.0.3",
+  "rec_version": "v6.0.3"
 }
\ No newline at end of file