Delete qiandao

.github/workflows/qiandao.yml

@@ -1,67 +0,0 @@
-name: qiandao
-
-on:
-  push:
-    paths:
-    - 'qiandao/Dockerfile'
-    - 'qiandao/root/**'
-  workflow_dispatch:
-
-jobs:
-  job1:
-    name: buildx tag
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: 'Set env'
-        run: |
-          echo "QIANDAO_VER=$(echo `grep -n "QIANDAO_VER=" qiandao/Dockerfile`|awk -F= '{print $2}')" >> $GITHUB_ENV
-
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: latest
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: ./qiandao
-          file: ./qiandao/Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: |
-            johngong/qiandao:latest
-            johngong/qiandao:${{ env.QIANDAO_VER }}
-            ghcr.io/gshang2017/qiandao:latest
-            ghcr.io/gshang2017/qiandao:${{ env.QIANDAO_VER }}
-
-      - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: johngong/qiandao
-          short-description: qiandao:${{ env.QIANDAO_VER }},自动签到程序。
-          readme-filepath: ./qiandao/README.md

README.md

@@ -11,7 +11,6 @@
 |koreader进度同步|[koreader-sync-server](https://github.com/gshang2017/docker/tree/master/koreader-sync-server)|
 |mpd音乐管理(蓝牙)|[mpd](https://github.com/gshang2017/docker/tree/master/mpd)|
 |qbittorrent下载|[qBittorrent](https://github.com/gshang2017/docker/tree/master/qBittorrent)|
-|qiandao签到|[qiandao](https://github.com/gshang2017/docker/tree/master/qiandao)|
 |rime搜狗流行词|[rime-sogou](https://github.com/gshang2017/docker/tree/master/rime-sogou)|
 |syncthing发现中继服务|[syncthing-relay-discosrv](https://github.com/gshang2017/docker/tree/master/syncthing-relay-discosrv)|
 |ttrss阅读|[tt-rss-plugins](https://github.com/gshang2017/docker/tree/master/tt-rss-plugins)|

qiandao/Dockerfile

@@ -1,60 +0,0 @@
-FROM python:3.12.8-alpine3.21
-
-ARG CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
-ARG S6_VER=3.2.0.2
-ARG QIANDAO_VER=20250129
-
-ENV UID=1000
-ENV GID=1000
-ENV TZ=Asia/Shanghai
-ENV DOMAIN=
-ENV MAIL_SMTP=
-ENV MAIL_PORT=
-ENV MAIL_SSL=True
-ENV MAIL_STARTTLS=False
-ENV MAIL_USER=
-ENV MAIL_PASSWORD=
-ENV MAIL_FROM=
-ENV MAIL_DOMAIN=
-ENV ADMIN_MAIL=
-ENV QIANDAO_UPDATE_AUTO=false
-ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
-ENV PATH=/opt/venv/bin:$PATH
-
-COPY --chmod=755 root /
-
-RUN  apk add --no-cache shadow bash ca-certificates tzdata sqlite git curl wget \
-&& apk add --no-cache --virtual qiandaodep build-base python3-dev libffi-dev curl-dev cargo \
-# install s6-overlay
-&& if [ "$(uname -m)" = "x86_64" ];then s6_arch=x86_64;elif [ "$(uname -m)" = "aarch64" ];then s6_arch=aarch64;elif [ "$(uname -m)" = "armv7l" ];then s6_arch=arm; fi \
-&& wget -P /tmp https://github.com/just-containers/s6-overlay/releases/download/v${S6_VER}/s6-overlay-noarch.tar.xz \
-&& tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz \
-&& wget -P /tmp https://github.com/just-containers/s6-overlay/releases/download/v${S6_VER}/s6-overlay-${s6_arch}.tar.xz \
-&& tar -C / -Jxpf /tmp/s6-overlay-${s6_arch}.tar.xz \
-&& wget -P /tmp https://github.com/just-containers/s6-overlay/releases/download/v${S6_VER}/s6-overlay-symlinks-noarch.tar.xz \
-&& tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz \
-&& wget -P /tmp https://github.com/just-containers/s6-overlay/releases/download/v${S6_VER}/s6-overlay-symlinks-arch.tar.xz \
-&& tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz \
-# install qiandao
-&& mkdir -p /usr/local/qiandao/app \
-&& git config --global advice.detachedHead false \
-&& git clone --depth 1 -b ${QIANDAO_VER} https://github.com/qd-today/qd.git /usr/local/qiandao/app \
-# add safe.directory
-&& git config --global --add safe.directory /usr/local/qiandao/app \
-#del ddddocr redis
-&& sed -i '/redis/d' /usr/local/qiandao/app/requirements.txt \
-&& sed -i '/ddddocr/d' /usr/local/qiandao/app/requirements.txt \
-#
-&& python3 -m venv /opt/venv \
-&& pip3 install --no-cache-dir -r /usr/local/qiandao/app/requirements.txt \
-&& pip3 install --no-cache-dir pycurl \
-#create qiandao user
-&&  useradd -u 1000 -U -d /config -s /bin/false qiandao \
-&&  usermod -G users qiandao \
-# clear
-&&  apk del qiandaodep \
-&&  rm -rf /var/cache/apk/* /tmp/*
-
-VOLUME /config
-EXPOSE 8923
-ENTRYPOINT [ "/init" ]

qiandao/README.md

@@ -1,153 +0,0 @@
-## 群晖nas自用。
-
-### GitHub:
-
-[https://github.com/gshang2017/docker](https://github.com/gshang2017/docker)
-
-### 感谢以下项目:
-
-[https://github.com/qiandao-today/qiandao](https://github.com/qiandao-today/qiandao)
-
-### 版本：
-
-|名称|版本|说明|
-|:-|:-|:-|
-|qiandao|20250129|amd64;arm64v8;arm32v7|
-
-### docker命令行设置：
-
-1. 下载镜像
-
-    |镜像源|命令|
-    |:-|:-|
-    |DockerHub|docker pull johngong/qiandao:latest|
-    |GitHub|docker pull ghcr.io/gshang2017/qiandao:latest|
-
-2. 创建qiandao容器
-
-* 不配置MAIL
-
-        docker create \
-           --name=qiandao \
-           -p 8923:8923 \
-           -v /数据库位置:/config \
-           -e UID=1000 \
-           -e GID=1000 \
-           --restart unless-stopped \
-           johngong/qiandao:latest
-
-* 配置MAIL
-
-        docker create \
-           --name=qiandao \
-           -p 8923:8923 \
-           -v /数据库位置:/config \
-           -e UID=1000 \
-           -e GID=1000 \
-           -e DOMAIN=域名或ip:端口 \
-           -e MAIL_SMTP=smtp.qq.com \
-           -e MAIL_PORT=465 \
-           -e MAIL_SSL=True \
-           -e MAIL_USER=**@qq.com \
-           -e MAIL_PASSWORD=** \
-           --restart unless-stopped \
-           johngong/qiandao:latest
-
-3. 运行
-
-       docker start qiandao
-
-4. 停止
-
-       docker stop qiandao
-
-5. 删除容器
-
-       docker rm qiandao
-
-6. 删除镜像
-
-       docker image rm johngong/qiandao:latest
-
-### 变量:
-
-|参数|说明|
-|:-|:-|
-| `--name=qiandao` |容器名|
-| `-p 8923:8923` |web访问端口|
-| `-v /数据库位置:/config ` |数据库database.db存储位置(旧版为/dbpath)|
-| `-e UID=1000` |uid设置,默认为1000|
-| `-e GID=1000` |gid设置,默认为1000|
-| `-e TZ=Asia/Shanghai` |系统时区设置,默认为Asia/Shanghai|
-| `-e DOMAIN=` |站点域名，可不设置，设置后可发送验证mail，需同时设置MAIL值，本地可设置为[IP:端口](ip:端口]);例:[192.168.1.111:8923](192.168.1.111:8923)|
-| `-e MAIL_SMTP=` |邮件smtp地址，可不设置，设置后可发送签到失败提醒mail，需同时设置DOMAIN值|
-| `-e MAIL_PORT=` |邮件端口值，ssl端口465 starttls端口587 非ssl端口25|
-| `-e MAIL_SSL=True` |邮件ssl开关，(True\|False),默认开启此功能|
-| `-e MAIL_STARTTLS=False` |邮件starttls开关，(True\|False),默认关闭此功能|
-| `-e MAIL_USER=` |邮件账户|
-| `-e MAIL_PASSWORD=` |邮件密码|
-| `-e MAIL_FROM=` |发送时使用的邮箱，默认与MAIL_USER相同|
-| `-e MAIL_DOMAIN=` |邮件域名|
-| `-e ADMIN_MAIL=` |设置管理员账户，可不设置，系统默认第一个注册用户为管理员|
-| `-e QIANDAO_UPDATE_AUTO=true` |自动更新qiandao(true\|false),默认开启此功能|
-
-### 群晖docker设置：
-
-1. 卷
-
-|参数|说明|
-|:-|:-|
-| `本地文件夹1:/config` |数据库database.db存储位置(旧版为/dbpath)|
-
-2. 端口
-
-|参数|说明|
-|:-|:-|
-| `本地端口1:8923` |web访问端口|
-
-3. 环境变量：
-
-|参数|说明|
-|:-|:-|
-| `UID=1000` |uid设置,默认为1000|
-| `GID=1000` |gid设置,默认为1000|
-| `TZ=Asia/Shanghai` |系统时区设置,默认为Asia/Shanghai|
-| `DOMAIN=` |站点域名，可不设置，设置后可发送验证mail，需同时设置MAIL值，本地可设置为[IP:端口](ip:端口]);例:[192.168.1.111:8923](192.168.1.111:8923)|
-| `MAIL_SMTP=` |邮件smtp地址，可不设置，设置后可发送签到失败提醒mail，需同时设置DOMAIN值|
-| `MAIL_PORT=` |邮件端口值，ssl端口465 starttls端口587 非ssl端口25|
-| `MAIL_SSL=True` |邮件ssl开关，(True\|False),默认开启此功能|
-| `MAIL_STARTTLS=False` |邮件starttls开关，(True\|False),默认关闭此功能|
-| `MAIL_USER=` |邮件账户|
-| `MAIL_PASSWORD=` |邮件密码|
-| `MAIL_FROM=` |发送时使用的邮箱，默认与MAIL_USER相同|
-| `MAIL_DOMAIN=` |邮件域名|
-| `ADMIN_MAIL=` |设置管理员账户，可不设置，系统默认第一个注册用户为管理员|
-| `QIANDAO_UPDATE_AUTO=false` |自动更新qiandao(true\|false),默认关闭此功能|
-
-* 公开模板：
-
-1. https://qiandao.today/tpls/public
-2. https://github.com/qd-today/templates
-
-### MAIL配置说明：
-
-1. 以hotmail邮箱配置为例：
-
-       MAIL_SMTP=smtp-mail.outlook.com
-       MAIL_PORT=587
-       MAIL_STARTTLS=True
-       MAIL_USER=**@hotmail.com
-       MAIL_PASSWORD=**
-
-2. 以qq邮箱配置为例：
-
-       MAIL_SMTP=smtp.qq.com
-       MAIL_PORT=465       
-       MAIL_SSL=True
-       MAIL_STARTTLS=False
-       MAIL_USER=**@qq.com
-       MAIL_PASSWORD=** （此值需入qq邮箱设置,开启POP3/SMTP服务并生成授权码）
-
-### 其它设置
-
-* 详见[https://github.com/qd-today/qd](https://github.com/qd-today/qd)

qiandao/docker-compose.yml

@@ -1,25 +0,0 @@
-services:
-  qiandao:
-    # github镜像：ghcr.io/johngong/qiandao:latest
-    image: johngong/qiandao:latest
-    container_name: qiandao
-    ports:
-      - 8923:8923
-    volumes:
-      - ./config:/config
-    environment:
-      UID: 1000
-      GID: 1000
-      #TZ: Asia/Shanghai
-      DOMAIN: ip_addr:port
-      MAIL_SMTP: smtp.qq.com
-      MAIL_PORT: 465
-      MAIL_SSL: "True"
-      MAIL_STARTTLS: "False"
-      MAIL_USER: [email protected]
-      MAIL_PASSWORD: password
-      #MAIL_FROM:
-      #MAIL_DOMAIN:
-      ADMIN_MAIL: [email protected]
-      QIANDAO_UPDATE_AUTO: false
-    restart: unless-stopped

qiandao/root/etc/cont-init.d/qiandao.sh

@@ -1,42 +0,0 @@
-#! /usr/bin/with-contenv bash
-
-#检查数据库文件夹位置
-if [ ! -d "/config" ]; then
-  mkdir -p /config
-fi
-if [ ! -L "/usr/local/qiandao/app/config" ]; then
-  if [ -e "/usr/local/qiandao/app/config" ]; then
-    rm -rf /usr/local/qiandao/app/config
-  fi
-  ln -s /config /usr/local/qiandao/app/config
-fi
-
-#设定qiandao更新任务
-if [ `grep -c update-qiandao.sh /var/spool/cron/crontabs/root` -eq 0 ]; then
-  echo "0       0       *       *       *       /usr/local/qiandao/defaults/update-qiandao.sh" >> /var/spool/cron/crontabs/root
-  echo qiandao更新任务已设定。
-else
-  echo qiandao更新任务已存在。
-fi
-
-#启动更新qiandao。
-if [ "$QIANDAO_UPDATE_AUTO" == "true" ]; then
-  /usr/local/qiandao/defaults/update-qiandao.sh
-fi
-
-#设置管理员
-if [ -n "$ADMIN_MAIL" ]; then
-  timeout 300 /usr/local/qiandao/defaults/change-admin-email.sh &
-fi
-
-#设置时区
-ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
-echo $TZ > /etc/timezone
-
-#修改用户UID GID
-groupmod -o -g "$GID" qiandao
-usermod -o -u "$UID" qiandao
-
-#修复权限
-chown -R qiandao:qiandao /usr/local/qiandao
-chown -R qiandao:qiandao /config

qiandao/root/etc/services.d/cron/run

@@ -1,4 +0,0 @@
-#! /usr/bin/with-contenv bash
-
-#启动qiandao更新任务
-exec crond -f -L /dev/null

qiandao/root/etc/services.d/qiandao/run

@@ -1,4 +0,0 @@
-#! /usr/bin/with-contenv bash
-
-# 启动qiandao程序
-exec s6-setuidgid qiandao python3 /usr/local/qiandao/app/run.py

qiandao/root/usr/local/qiandao/defaults/change-admin-email.sh

@@ -1,11 +0,0 @@
-#! /bin/sh
-
-while [ ! -e "/config/database.db" ]; do
-  sleep 3
-done
-while [ "$(sqlite3 /config/database.db "SELECT id FROM user WHERE email='$ADMIN_MAIL';" |wc -l)" -eq 0 ]; do
-  sleep 3
-done
-if [ "$(sqlite3 /config/database.db "SELECT role FROM user WHERE email='$ADMIN_MAIL';" |grep "admin" |wc -l)" -eq 0 ]; then
-  python3 /usr/local/qiandao/app/chrole.py $ADMIN_MAIL admin
-fi

qiandao/root/usr/local/qiandao/defaults/update-qiandao.sh

@@ -1,20 +0,0 @@
-#! /bin/sh
-
-if [ "$QIANDAO_UPDATE_AUTO" == "true" ]; then
-  cd /usr/local/qiandao/app
-  git checkout -- /usr/local/qiandao/app/requirements.txt
-  oldver=$(git describe --abbrev=0 --tags)
-  lastver=$(curl --silent https://api.github.com/repos/qd-today/qd/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
-  if [ -n "$lastver" ] && [ "$lastver" != "$oldver" ]; then
-    git fetch origin tag $lastver --shallow-since=$(echo "`git show --pretty=format:"%ct" | head -1`-86400" | date -d @`bc` "+%Y-%m-%d")
-    git merge $lastver
-  fi
-  chown -R qiandao:qiandao /usr/local/qiandao
-  chown -R qiandao:qiandao /config
-  if [ -n "$lastver" ] && [ "$lastver" != "$oldver" ]; then
-    sed -i '/redis/d' /usr/local/qiandao/app/requirements.txt
-    sed -i '/ddddocr/d' /usr/local/qiandao/app/requirements.txt
-    chown qiandao:qiandao /usr/local/qiandao/app/requirements.txt
-    pip3 install --no-cache-dir -r /usr/local/qiandao/app/requirements.txt
-  fi
-fi