From feec05e10149f7314894b3d6284285f2aaa564d5 Mon Sep 17 00:00:00 2001
From: 14790897 <14790897abc@gmail.com>
Date: Mon, 22 Apr 2024 20:07:24 +0800
Subject: [PATCH] fix: cron

---
 .github/workflows/cron-docker .yml | 28 ----------
 README.md                          |  8 +++
 cron-Dockerfile                    | 90 ------------------------------
 cron-docker-compose.yml            |  9 ---
 cron.sh                            |  2 +-
 5 files changed, 9 insertions(+), 128 deletions(-)
 delete mode 100644 .github/workflows/cron-docker .yml
 delete mode 100644 cron-Dockerfile
 delete mode 100644 cron-docker-compose.yml

diff --git a/.github/workflows/cron-docker .yml b/.github/workflows/cron-docker .yml
deleted file mode 100644
index c88569a8..00000000
--- a/.github/workflows/cron-docker .yml	
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Cron AutoRead Docker Image Push
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check Out Repo
-        uses: actions/checkout@v2
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: ./cron-Dockerfile
-          push: true
-          tags: 14790897/cron-auto-read:latest
diff --git a/README.md b/README.md
index 53a9364b..2f18aefd 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,14 @@ docker-compose logs -f
 
 ### 2.定时运行
 
+```sh
+chmod +x cron.sh
+
+crontab -e
+```
+
+手动添加以下内容(功能是每天六点执行)
+
 ```sh
 0 6 * * *  /root/auto-read-liunxdo/cron.sh  # 注意这是示例目录，要改为所在仓库目录的cron.sh（使用pwd查看所在目录）
 ```
diff --git a/cron-Dockerfile b/cron-Dockerfile
deleted file mode 100644
index 5f141c3e..00000000
--- a/cron-Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# 使用官方 Node.js 作为父镜像
-FROM node:18-slim
-
-# 设置工作目录
-WORKDIR /app
-
-# 复制 package.json 和 package-lock.json (如果存在)
-COPY package*.json ./
-
-# 安装 Puppeteer 依赖
-RUN apt-get update && apt-get install -y \
-    cron\
-    wget \
-    ca-certificates \
-    fonts-liberation \
-    libappindicator3-1 \
-    libasound2 \
-    libatk-bridge2.0-0 \
-    libatk1.0-0 \
-    libc6 \
-    libcairo2 \
-    libcups2 \
-    libdbus-1-3 \
-    libexpat1 \
-    libfontconfig1 \
-    libgbm1 \
-    libgcc1 \
-    libgdk-pixbuf2.0-0 \
-    libglib2.0-0 \
-    libgtk-3-0 \
-    libnspr4 \
-    libnss3 \
-    libpango-1.0-0 \
-    libpangocairo-1.0-0 \
-    libstdc++6 \
-    libx11-6 \
-    libx11-xcb1 \
-    libxcb1 \
-    libxcomposite1 \
-    libxcursor1 \
-    libxdamage1 \
-    libxext6 \
-    libxfixes3 \
-    libxi6 \
-    libxrandr2 \
-    libxrender1 \
-    libxss1 \
-    libxtst6 \
-    lsb-release \
-    xdg-utils \
-    --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
-#时区为中国
-
-# 将你的 Puppeteer 脚本复制到容器中
-COPY --chmod=777 . .
-
-#时区为中国
-ENV TZ=Asia/Shanghai
-
-# 安装 Node.js 依赖
-RUN npm install
-
-
-# 添加执行权限
-RUN chmod +x /app/pteer.js
-
-# 创建一个新的脚本文件
-RUN echo '#!/bin/bash\n\
-    cd /app\n\
-    /usr/local/bin/node /app/pteer.js >> /var/log/cron.log 2>&1 &\n\
-    sleep 10m\n\
-    pkill -f "node /app/pteer.js"\n' > /app/run_task.sh
-
-# 给脚本文件添加执行权限
-RUN chmod +x /app/run_task.sh
-
-# 创建一个新的 crontab 文件
-RUN echo "0 3 * * * root /app/run_task.sh" > /etc/cron.d/puppeteer-cron
-
-# 给 crontab 文件适当的权限
-RUN chmod 0644 /etc/cron.d/puppeteer-cron
-
-# 将 cron 日志文件的权限设置为可写 
-RUN touch /var/log/cron.log && chmod 0666 /var/log/cron.log
-
-# 将 cron 设置为在前台运行,并将日志输出到控制台
-CMD cron -f && tail -f /var/log/cron.log
-
-
diff --git a/cron-docker-compose.yml b/cron-docker-compose.yml
deleted file mode 100644
index 0f750d10..00000000
--- a/cron-docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "3.8" # 使用 Docker Compose 文件版本 3.8，根据需要可以更改
-services:
-  cronautoread:
-    image: 14790897/cron-auto-read:latest
-    container_name: cron-auto-read
-    environment: # 设置环境变量(这里设置后不需要在.env文件中设置)
-      USERNAMES: hahaha2,hahaha1,ha1,ha2,DrKBoogieWoogie,lsp,lsb
-      PASSWORDS: BfdSGt}F4!5pLHt,BfdSGt}F4!5pLHt,iTs9Wx4+3Eavkhk,W$RhQUVn5E?BBBq,]"w%2Qd%M8Z6-SS,HU5B6Ee]kRB%Qj',uYE)46Ej8phu$#u
-    restart: unless-stopped # 容器退出时重启策略
diff --git a/cron.sh b/cron.sh
index 1bf14cb9..daeecc1e 100644
--- a/cron.sh
+++ b/cron.sh
@@ -16,4 +16,4 @@ cd $WORKDIR
 sleep 10m
 
 # 停止 Docker Compose
-/usr/local/bin/docker-compose down >> ./cron.log 2>&1
+/usr/local/bin/docker-compose down --remove-orphans --volumes >> ./cron.log 2>&1