Merge pull request #93 from jamebal/ocr

chore: remove  jmalcloud-nvidia

.github/workflows/build_jdk_ffmpeg.yml

@@ -1,4 +1,4 @@
-name: Build jdk17_ffmpeg
+name: Build jdk17_ffmpeg_nvidia
 
 on:
   workflow_dispatch:
@@ -41,7 +41,10 @@ jobs:
           context: .
           file: docker/Dockerfile
           push: true
-          tags: jmal/jdk17_ffmpeg:latest
+          tags: jmal/jdk17_ffmpeg_nvidia:latest
           platforms: linux/amd64,linux/arm64
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          build-args: |
+            ARCH=${{ matrix.arch }}
+    strategy:
+      matrix:
+        arch: [amd64, arm64]

.github/workflows/test-build.yml

@@ -1,4 +1,4 @@
-name: Build test
+name: Build test (nvidia)
 
 on:
   push:
@@ -52,8 +52,8 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: |
-            jmal/jmalcloud:test
-            ghcr.io/${{ secrets.GHCR_IO_USERNAME }}/jmalcloud:test
+            jmal/jmalcloud-nvidia:test
+            ghcr.io/${{ secrets.GHCR_IO_USERNAME }}/jmalcloud-nvidia:test
           platforms: linux/amd64,linux/arm64
           build-args: |
             VERSION=${{ env.PROJECT_VERSION }}

docker/Dockerfile

@@ -1,15 +1,43 @@
-FROM eclipse-temurin:17-jre
+FROM nvidia/cuda:11.7.1-base-ubuntu22.04 AS base
 
-# 安装 ffmpeg 和 tesseract
-RUN apt-get update && \
-    apt-get install -y ffmpeg libavcodec-extra locales tesseract-ocr && \
-    locale-gen en_US.UTF-8 && \
-    update-locale LANG=en_US.UTF-8
+# 设置非交互式安装，避免 tzdata 等包的配置暂停
+ENV DEBIAN_FRONTEND=noninteractive
 
-# 设置环境变量
+# 安装wget 和 tesseract
+RUN apt-get update && apt-get install -y wget && apt-get install -y locales tesseract-ocr && \
+                                                  locale-gen en_US.UTF-8 && \
+                                                  update-locale LANG=en_US.UTF-8
+
+ARG ARCH=amd64
+
+# 下载jellyfin-ffmpeg.deb
+RUN wget https://repo.jellyfin.org/files/ffmpeg/ubuntu/latest-5.x/${ARCH}/jellyfin-ffmpeg5_5.1.4-3-jammy_${ARCH}.deb
+
+# 安装下载的 jellyfin-ffmpeg.deb
+RUN dpkg -i jellyfin-ffmpeg5_5.1.4-3-jammy_${ARCH}.deb || apt-get install -fy
+
+# 卸载 wget 并清理
+RUN apt-get remove -y wget && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# 清除安装文件
+RUN rm -rf jellyfin-ffmpeg5_5.1.4-3-jammy_${ARCH}.deb
+
+# 将/usr/lib/jellyfin-ffmpeg添加到PATH
+ENV PATH=/usr/lib/jellyfin-ffmpeg:$PATH
+
+# 环境变量
 ENV LANG=en_US.UTF-8 \
     LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8
+    LC_ALL=en_US.UTF-8 \
+    LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64 \
+    NVIDIA_DRIVER_CAPABILITIES=compute,utility,video \
+    NVIDIA_VISIBLE_DEVICES=all
+
+FROM eclipse-temurin:17-jre AS java-base
+
+# 合并 CUDA 和 Java 环境
+FROM base AS final
+COPY --from=java-base /opt/java/openjdk /opt/java/openjdk
 
 # 设置时区
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
@@ -20,4 +48,10 @@ ADD docker/ip2region.xdb /jmalcloud/
 
 ADD tess4j/datapath/chi_sim.traineddata /jmalcloud/tess4j/datapath/
 
+
 ADD target/lib /usr/local/clouddisk-lib
+
+# 更新 PATH 和 LD_LIBRARY_PATH
+ENV PATH="/opt/java/openjdk/bin:${PATH}"
+
+CMD ["bash"]