From b04af3ba44c8f3812af835f13a119b6c7a345b3f Mon Sep 17 00:00:00 2001
From: yshtcn <k.yshtcn+github@gmail.com>
Date: Thu, 12 Oct 2023 23:30:57 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=B8=AD=E7=9A=84=E7=A9=BA=E6=A0=BC=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=20-=20=E5=A2=9E=E5=8A=A0=E4=BA=86docker?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC=20-=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86Dockerfile=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Diary Assistant_pyinstaller.bat           |  2 +-
 Diary-Assistant_DockerBuilder.ps1         | 33 +++++++++++++++++++++++
 Diary Assistant.bat => DiaryAssistant.bat |  2 +-
 Diary Assistant.py => DiaryAssistant.py   |  0
 Dockerfile                                |  7 ++---
 README.md                                 | 18 +++++++++++--
 6 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 Diary-Assistant_DockerBuilder.ps1
 rename Diary Assistant.bat => DiaryAssistant.bat (68%)
 rename Diary Assistant.py => DiaryAssistant.py (100%)

diff --git a/Diary Assistant_pyinstaller.bat b/Diary Assistant_pyinstaller.bat
index 3cd28b1..61a20b4 100644
--- a/Diary Assistant_pyinstaller.bat	
+++ b/Diary Assistant_pyinstaller.bat	
@@ -105,7 +105,7 @@ rd /S /Q %~dp0\build\build
 
 :: 进入打包目录并开始打包
 cd /d %~dp0\build
-pyinstaller --onefile --version-file %~dp0\version_info.txt "%~dp0\Diary Assistant.py"
+pyinstaller --onefile --version-file %~dp0\version_info.txt "%~dp0\DiaryAssistant.py"
 
 ::更新标题
 title "AutoPyInstaller：打包完毕，进行一些收尾工作"
diff --git a/Diary-Assistant_DockerBuilder.ps1 b/Diary-Assistant_DockerBuilder.ps1
new file mode 100644
index 0000000..d755b13
--- /dev/null
+++ b/Diary-Assistant_DockerBuilder.ps1
@@ -0,0 +1,33 @@
+# Set-ExecutionPolicy RemoteSigned -Scope CurrentUser
+
+# 检查是否以管理员权限运行
+if (-NOT ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) {
+    # 请求管理员权限
+    Start-Process powershell -ArgumentList "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs
+    exit
+}
+
+# 更改到脚本的目录
+Set-Location $PSScriptRoot
+
+
+# 获取当前日期和时间
+$dateTime = Get-Date -Format "yyyyMMdd"
+
+# 输出提示并获取版本的最后一位
+$revision = Read-Host -Prompt "请输入今天的版本次 ($dateTime,[?])"
+
+# 构建版本号
+$version = "$dateTime" + "_$revision"
+
+# 构建并打上版本号标签的 Docker 镜像
+docker build -t yshtcn/diary-assistant:$version .
+
+# 推送具有版本号标签的 Docker 镜像到 Docker Hub
+docker push yshtcn/diary-assistant:$version
+
+# 为镜像打上 'latest' 标签并推送
+docker tag yshtcn/diary-assistant:$version yshtcn/diary-assistant:latest
+docker push yshtcn/diary-assistant:latest
+
+pause
\ No newline at end of file
diff --git a/Diary Assistant.bat b/DiaryAssistant.bat
similarity index 68%
rename from Diary Assistant.bat
rename to DiaryAssistant.bat
index 543ba9c..6ef4944 100644
--- a/Diary Assistant.bat	
+++ b/DiaryAssistant.bat
@@ -2,6 +2,6 @@
 cd %~dp0
 :start
 git pull
-py "Diary Assistant.py"
+py DiaryAssistant.py
 pause
 goto start
\ No newline at end of file
diff --git a/Diary Assistant.py b/DiaryAssistant.py
similarity index 100%
rename from Diary Assistant.py
rename to DiaryAssistant.py
diff --git a/Dockerfile b/Dockerfile
index 1a85c4e..5c1232f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,11 @@ FROM python:3.11-slim
 WORKDIR /usr/src/app
 
 # 灏嗗綋鍓嶇洰褰曚笅鐨勬墍鏈夋枃浠跺鍒跺埌闀滃儚涓殑宸ヤ綔鐩綍
-COPY . .
+COPY DiaryAssistant.py ./
 
-# 鍒涘缓/data鐩綍鐢ㄤ簬瀛樺偍鐢熸垚鐨勬枃浠�
-RUN mkdir /data
+
+# 鍒涘缓/data鐩綍鐢ㄤ簬瀛樺偍鐢熸垚鐨勬枃浠跺苟璁剧疆777鏉冮檺
+RUN mkdir /data && chmod -R 777 /data
 
 # 瀹氫箟鐜鍙橀噺 PIP_INDEX_URL 骞惰缃叾榛樿鍊间负娓呭崕澶у鐨勬洿鏂版簮
 ENV PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
diff --git a/README.md b/README.md
index b336773..4899a8e 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,20 @@
 
 # 浣跨敤鏂规硶
 
-棣栨杩愯鏃讹紝浼氳嚜鍔ㄧ敓鎴恇ot_config.json锛屽苟鑷姩閫�鍑恒��
+## Windows鐗堟湰
+
+棣栨杩愯鏃讹紝浼氳嚜鍔ㄧ敓鎴恇ot_config.json锛屽苟鑷姩鎻愮ず鎸変换鎰忛敭閫�鍑恒��
 鐒跺悗鎶婁綘鐨刡otid濉繘bot_config.json锛屽苟閰嶇疆濂戒唬鐞嗗湴鍧�锛堝鏋滀笉闇�瑕佷唬鐞嗗湴鍧�锛岀洿鎺ュ垹闄や唬鐞嗕俊鎭嵆鍙級銆�
-鍐嶆鍚姩锛屽悜浣犵殑bot鍙戦��/start鐪嬬湅鏄惁鍙互姝ｅ父杩愯灏卞彲浠ヤ簡銆�
\ No newline at end of file
+鍐嶆鍚姩锛屽悜浣犵殑bot鍙戦��/start鐪嬬湅鏄惁鍙互姝ｅ父杩愯灏卞彲浠ヤ簡銆�
+
+## Docker鐗堟湰
+
+```docker run -v /mydata:/data yshtcn/diary-assistant```
+
+鍏朵腑-v 鏄繀閫夊弬鏁帮紝鎶�/mydata鎹㈡垚鏄犲皠鐨勭洰鐨勮矾寰勶紝棣栨杩愯鏃讹紝浼氳嚜鍔ㄧ敓鎴恇ot_config.json锛屽苟鑷姩閫�鍑恒��
+鐒跺悗鎶婁綘鐨刡otid濉繘鏄犲皠鐩殑鍦板潃涓嬬殑bot_config.json锛屽苟閰嶇疆濂戒唬鐞嗗湴鍧�锛堝鏋滀笉闇�瑕佷唬鐞嗗湴鍧�锛岀洿鎺ュ垹闄や唬鐞嗕俊鎭嵆鍙級銆�
+鍐嶆鍚姩锛屽悜浣犵殑bot鍙戦��/start鐪嬬湅鏄惁鍙互姝ｅ父杩愯灏卞彲浠ヤ簡銆�
+
+鍙�夊弬鏁帮細
+```-e PIP_INDEX_URL=https://pypi.official.url/simple```
+闀滃儚榛樿浣跨敤娓呭崕澶у鐨勬洿鏂版簮锛屽鏋滀綘闇�瑕佷慨鏀逛娇鐢ㄥ叾浠栧湴鍖虹殑婧愬彲浠ユ寚瀹氥��