qiandao:20240210

qiandao/Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.19
 
 ARG S6_VER=3.1.6.2
-ARG QIANDAO_VER=20240208
+ARG QIANDAO_VER=20240210
 
 ENV UID=1000
 ENV GID=1000
@@ -10,14 +10,12 @@ 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 ENABLE_MAIL_STARTTLS=false
 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 
 COPY --chmod=755 root /

qiandao/README.md

@@ -12,7 +12,7 @@
 
 |名称|版本|说明|
 |:-|:-|:-|
-|qiandao|20240208|amd64;arm64v8;arm32v7|
+|qiandao|20240210|amd64;arm64v8;arm32v7|
 
 ### docker命令行设置：
 
@@ -90,14 +90,12 @@
 | `-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),默认开启此功能|
-| `-e ENABLE_MAIL_STARTTLS=false` |支持STARTTLS邮件发送(true\|false),默认关闭此功能|
 
 ### 群晖docker设置：
 
@@ -124,14 +122,12 @@
 | `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),默认关闭此功能|
-| `ENABLE_MAIL_STARTTLS=false` |支持STARTTLS邮件发送(true\|false),默认关闭此功能|
 
 * 公开模板：
 

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

@@ -22,14 +22,6 @@ fi
 #启动更新qiandao。
 if [ "$QIANDAO_UPDATE_AUTO" == "true" ]; then
   /usr/local/qiandao/defaults/update-qiandao.sh
-else
-  #支持STARTTLS邮件发送
-  cd /usr/local/qiandao/app
-  git checkout -- /usr/local/qiandao/app/config.py
-  git checkout -- /usr/local/qiandao/app/libs/utils.py
-  if [ "$ENABLE_MAIL_STARTTLS" == "true" ]; then
-    /usr/local/qiandao/defaults/mail_starttls.sh
-  fi
 fi
 
 #设置管理员

qiandao/root/usr/local/qiandao/defaults/mail_starttls.sh

@@ -1,19 +0,0 @@
-#! /bin/sh
-
-version=20230601
-
-if [ "$(grep -wn "mail_starttls" /usr/local/qiandao/app/config.py |awk -F: '{print $1}'|wc -l)" -eq 0 ]; then
-  h1=$(grep -wn "mail_ssl" /usr/local/qiandao/app/config.py |awk -F: '{print $1}')
-  sed -i "${h1} a mail_starttls = bool\(strtobool(os.getenv\('MAIL_STARTTLS','False'\)\)\)" /usr/local/qiandao/app/config.py
-fi
-if [ "$(grep -wn "starttls" /usr/local/qiandao/app/libs/utils.py |awk -F: '{print $1}'|wc -l)" -eq 0 ]; then
-  h2=$(grep -wn "s = smtplib.SMTP_SSL(config.mail_smtp, config.mail_port)" /usr/local/qiandao/app/libs/utils.py |awk -F: '{print $1}')
-  sed -i "${h2} a  \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ if not config.mail_starttls:" /usr/local/qiandao/app/libs/utils.py
-  sed -i "`expr ${h2} + 1` a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ s = smtplib.SMTP_SSL\(config.mail_smtp, config.mail_port\)" /usr/local/qiandao/app/libs/utils.py
-  sed -i "`expr ${h2} + 2` a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ else:" /usr/local/qiandao/app/libs/utils.py
-  sed -i "`expr ${h2} + 3` a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ s = smtplib.SMTP\(config.mail_smtp, config.mail_port\)" /usr/local/qiandao/app/libs/utils.py
-  sed -i ${h2}d /usr/local/qiandao/app/libs/utils.py
-  h3=$(grep -wn "s.connect(config.mail_smtp, config.mail_port)" /usr/local/qiandao/app/libs/utils.py |awk -F: '{print $1}')
-  sed -i "${h3} a \ \ \ \ \ \ \ \ \ \ \ \ if config.mail_starttls:" /usr/local/qiandao/app/libs/utils.py
-  sed -i "`expr ${h3} + 1` a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ s.starttls\(\)" /usr/local/qiandao/app/libs/utils.py
-fi

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

@@ -2,8 +2,6 @@
 
 if [ "$QIANDAO_UPDATE_AUTO" == "true" ]; then
   cd /usr/local/qiandao/app
-  git checkout -- /usr/local/qiandao/app/config.py
-  git checkout -- /usr/local/qiandao/app/libs/utils.py
   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/')
@@ -11,16 +9,6 @@ if [ "$QIANDAO_UPDATE_AUTO" == "true" ]; 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
-  if [ "$ENABLE_MAIL_STARTTLS" == "true" ]; then
-    sh_oldver=$(cat /usr/local/qiandao/defaults/mail_starttls.sh|grep "version"|cut -d "=" -f2)
-    sh_lastver=$(curl --silent https://raw.githubusercontent.com/gshang2017/docker/master/qiandao/root/usr/local/qiandao/defaults/mail_starttls.sh|grep "version"|cut -d "=" -f2)
-    if [ -n "$sh_lastver" ] && [ "$sh_lastver" != "$sh_oldver" ]; then
-      curl  --retry 2  -o /usr/local/qiandao/defaults/mail_starttls.sh -L  https://raw.githubusercontent.com/gshang2017/docker/master/qiandao/root/usr/local/qiandao/defaults/mail_starttls.sh
-      chown qiandao:qiandao /usr/local/qiandao/defaults/mail_starttls.sh
-      chmod +x /usr/local/qiandao/defaults/mail_starttls.sh
-    fi
-    /usr/local/qiandao/defaults/mail_starttls.sh
-  fi
   chown -R qiandao:qiandao /usr/local/qiandao
   chown -R qiandao:qiandao /config
   if [ -n "$lastver" ] && [ "$lastver" != "$oldver" ]; then