zhangliang 2 周之前
父节点
当前提交
6a19d3b190
共有 3 个文件被更改,包括 27 次插入17 次删除
  1. 11 1
      docker-compose.yml
  2. 7 7
      docker-run.sh
  3. 9 9
      manage.sh

+ 11 - 1
docker-compose.yml

@@ -7,4 +7,14 @@ services:
       - .env
     volumes:
       - ./logs:/app/logs
-    restart: unless-stopped
+    restart: unless-stopped
+    networks:
+      - cookie-network
+    deploy:
+      resources:
+        limits:
+          memory: 2G
+          cpus: '1.0'
+        reservations:
+          memory: 512M
+          cpus: '0.5'

+ 7 - 7
docker-run.sh

@@ -9,9 +9,9 @@ if ! command -v docker &> /dev/null; then
     exit 1
 fi
 
-# 检查 docker-compose 是否安装
-if ! command -v docker-compose &> /dev/null; then
-    echo "❌ docker-compose 未安装,请先安装 docker-compose"
+# 检查 docker compose 是否可用
+if ! docker compose version &> /dev/null; then
+    echo "❌ Docker Compose 不可用"
     exit 1
 fi
 
@@ -53,10 +53,10 @@ fi
 
 # 构建并启动服务
 echo "🚀 构建和启动 Docker 服务..."
-docker-compose up -d --build
+docker compose up -d --build
 
 echo "✅ 服务已启动"
 echo "🔗 使用远程 Redis: r-t4n023zec9wyjeer0spd.redis.singapore.rds.aliyuncs.com"
-echo "📊 查看日志: docker-compose logs -f cookie-job"
-echo "🛑 停止服务: docker-compose down"
-echo "🔧 进入容器: docker-compose exec cookie-job bash"
+echo "📊 查看日志: docker compose logs -f cookie-generator"
+echo "🛑 停止服务: docker compose down"
+echo "🔧 进入容器: docker compose exec cookie-generator bash"

+ 9 - 9
manage.sh

@@ -3,34 +3,34 @@
 
 case $1 in
     start)
-        docker-compose up -d
+        docker compose up -d
         echo "✅ 服务已启动"
         ;;
     stop)
-        docker-compose down
+        docker compose down
         echo "✅ 服务已停止"
         ;;
     restart)
-        docker-compose restart
+        docker compose restart
         echo "✅ 服务已重启"
         ;;
     status)
-        docker-compose ps
+        docker compose ps
         ;;
     logs)
-        docker-compose logs -f cookie-generator
+        docker compose logs -f cookie-generator
         ;;
     build)
-        docker-compose build --no-cache
+        docker compose build --no-cache
         echo "✅ 镜像重建完成"
         ;;
     shell)
-        docker-compose exec cookie-generator bash
+        docker compose exec cookie-generator bash
         ;;
     update)
         git pull
-        docker-compose build --no-cache
-        docker-compose up -d
+        docker compose build --no-cache
+        docker compose up -d
         echo "✅ 更新完成"
         ;;
     *)