From 34cf6e9cbf971336676044fe94c18be8bbaa8eba Mon Sep 17 00:00:00 2001
From: imbytecat <imbytecat@gmail.com>
Date: Tue, 8 Jul 2025 00:45:37 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BD=BF=E7=94=A8archlinux:base-devel?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=9F=BA=E7=A1=80=E9=95=9C=E5=83=8F=E5=B9=B6?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=96=87=E4=BB=B6=E6=9E=84=E5=BB=BA=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用archlinux:base-devel替换基础镜像并简化文件构建步骤。
---
 Dockerfile   | 28 ++++++++++++++--------------
 src/wcocr.ts |  1 -
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 59550f6..9009800 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,18 @@
-# FROM greyltc/archlinux-aur:yay AS lib
-# WORKDIR /src
-# RUN yay -Syu --noconfirm cmake python nodejs && \
-#     git clone https://github.com/swigger/wechat-ocr.git wcocr && \
-#     sed -i 's/v3.21.0/v3.21.2/g' wcocr/CMakeLists.txt && \
-#     mkdir -p wcocr/build && cd wcocr/build && cmake .. && make -j$(nproc)
+FROM archlinux:base-devel AS lib
+WORKDIR /src
+RUN pacman -Syu --noconfirm cmake python nodejs && \
+    git clone https://github.com/swigger/wechat-ocr.git wcocr && \
+    sed -i 's/v3.21.0/v3.21.2/g' wcocr/CMakeLists.txt && \
+    mkdir -p wcocr/build && cd wcocr/build && cmake .. && make -j$(nproc)
 
-FROM greyltc/archlinux-aur:yay
+FROM greyltc/archlinux-aur:yay AS builder
 WORKDIR /app
-RUN aur-install bun-bin wechat-bin && \
-    echo "Hello World"
-# COPY --from=lib /src/wcocr/build/libwcocr.so .
+RUN aur-install bun-bin
+COPY --from=lib /src/wcocr/build/libwcocr.so .
 # COPY src/index.ts .
-# RUN bun install hono
 
-# EXPOSE 3000
-
-# CMD ["bun", "src/index.ts"]
+# FROM greyltc/archlinux-aur:yay AS runner
+# WORKDIR /app
+# RUN aur-install wechat-bin
+# COPY --from=builder /app/bun-bin .
+# COPY --from=lib /src/wcocr/build/libwcocr.so .
diff --git a/src/wcocr.ts b/src/wcocr.ts
index 36fa478..19d4949 100644
--- a/src/wcocr.ts
+++ b/src/wcocr.ts
@@ -57,7 +57,6 @@ async function callWechatOcr(
 }
 
 async function main() {
-  // 请在这里替换为你的实际路径
   const ocrExe = '/opt/wechat/wxocr'
   const wechatDir = '/opt/wechat'
   const imgfn = '/home/imbytecat/Pictures/Screenshots/Screenshot_07-Jul_10-00-20_9907.png'