From a555c44e54b86e18d5a64b2da54792447508c277 Mon Sep 17 00:00:00 2001
From: SzeMeng76 <80573337+SzeMeng76@users.noreply.github.com>
Date: Fri, 25 Oct 2024 16:10:45 +0800
Subject: [PATCH 1/2] fix : update watchtower

Update watchtower on warp version
---
 docker-compose-warp.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/docker-compose-warp.yml b/docker-compose-warp.yml
index 1cadcc1..c298fcf 100644
--- a/docker-compose-warp.yml
+++ b/docker-compose-warp.yml
@@ -22,18 +22,16 @@ services:
       timeout: 10s   # 请求超时10秒
       retries: 3     # 失败3次后标记为不健康
       start_period: 5s  # 容器启动后等待5秒再开始检查
-
-
-
+      
   chat2api:
     image: lanqian528/chat2api:latest
     container_name: chat2api
     restart: unless-stopped
-    build: ~/pygpt/chat2api
     ports:
       - '5005:5005'  # 暴露chat2api服务供外部访问
     environment:
       - UPLOAD_BY_URL=true
+      - AUTHORIZATION=sk-xxx
       - CHATGPT_BASE_URL=https://chatgpt.com
       - TZ=Asia/Shanghai
       - HISTORY_DISABLED=true
@@ -47,6 +45,15 @@ services:
       - internal_network  # chat2api 和 warp 在同一个内部网络
     volumes:
       - ./data:/app/data # 挂载一些需要保存的数据
+
+  watchtower:
+    image: containrrr/watchtower
+    container_name: watchtower
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: --cleanup --interval 300 chat2api
+    
 networks:
   internal_network:
-    driver: bridge  # 定义一个桥接网络
\ No newline at end of file
+    driver: bridge  # 定义一个桥接网络

From 97d3524a0b76cef39b5785a289ef53468c42a3da Mon Sep 17 00:00:00 2001
From: lanqian528 <5499636+lanqian528@users.noreply.github.com>
Date: Sun, 27 Oct 2024 09:41:31 +0800
Subject: [PATCH 2/2] v1.5.9 merge pr

---
 README.md               | 4 ++--
 docker-compose-warp.yml | 7 +------
 docker-compose.yml      | 1 +
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0645a75..bc7832a 100644
--- a/README.md
+++ b/README.md
@@ -123,10 +123,10 @@ cd chat2api
 在此目录中下载库中的 docker-compose.yml 文件：
 
 ```bash
-wget https://raw.githubusercontent.com/LanQian528/chat2api/main/docker-compose.yml
+wget https://raw.githubusercontent.com/LanQian528/chat2api/main/docker-compose-warp.yml
 ```
 
-修改 docker-compose.yml 文件中的环境变量，保存后：
+修改 docker-compose-warp.yml 文件中的环境变量，保存后：
 
 ```bash
 docker-compose up -d
diff --git a/docker-compose-warp.yml b/docker-compose-warp.yml
index c298fcf..37f262b 100644
--- a/docker-compose-warp.yml
+++ b/docker-compose-warp.yml
@@ -30,13 +30,8 @@ services:
     ports:
       - '5005:5005'  # 暴露chat2api服务供外部访问
     environment:
-      - UPLOAD_BY_URL=true
-      - AUTHORIZATION=sk-xxx
-      - CHATGPT_BASE_URL=https://chatgpt.com
       - TZ=Asia/Shanghai
-      - HISTORY_DISABLED=true
-      - SCHEDULED_REFRESH=true
-      - ENABLE_GATEWAY=false
+      - AUTHORIZATION=sk-xxx
       - PROXY_URL=socks5://warp:1080  # 设置 PROXY_URL 为 warp 容器的代理地址
     depends_on:
       warp:
diff --git a/docker-compose.yml b/docker-compose.yml
index 7351275..d64acd0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - ./data:/app/data
     environment:
       - TZ=Asia/Shanghai
+      - AUTHORIZATION=sk-xxx
 
   watchtower:
     image: containrrr/watchtower