Update Dockerfile

Dockerfile

@@ -1,96 +1,58 @@
-# FROM openjdk:17-jdk-slim AS builder
-
-# WORKDIR /app
-
-# # 安装必要的构建工具
-# RUN apt-get update && apt-get install -y \
-#     git \
-#     curl \
-#     gradle \
-#     maven
-
-# # 克隆项目代码
-# RUN git clone https://github.com/Stirling-Tools/Stirling-PDF.git .
-
-# # 构建项目
-# RUN ./gradlew build
-
-# FROM openjdk:17-jdk-slim
-
-# WORKDIR /app
-
-# COPY --from=builder /app/build/libs/*.jar /app/stirling-pdf.jar
-
-# RUN mkdir -p /app/logs /app/configs /app/customFiles && \
-#     chmod -R 777 /app/logs /app/configs /app/customFiles
-
-# # 安装运行时依赖
-# RUN apt-get update && apt-get install -y \
-#     libreoffice \
-#     poppler-utils \
-#     tesseract-ocr \
-#     tesseract-ocr-eng \
-#     python3 \
-#     python3-pip && \
-#     pip3 install --no-cache-dir unoconv WeasyPrint pdf2image pillow && \
-#     rm -rf /var/lib/apt/lists/*
-
-# # 设置环境变量
-# ENV JAVA_TOOL_OPTIONS="-XX:MaxRAMPercentage=75"
-
-# # 暴露端口 7860
-# EXPOSE 7860
-
-# # 启动应用程序
-# CMD ["java", "-Dserver.port=7860", "-Dserver.address=0.0.0.0", "-Dfile.encoding=UTF-8", "-jar", "/app/stirling-pdf.jar"]
-FROM openjdk:17-jdk-slim AS builder
+FROM openjdk:17-jdk-slim
 
 WORKDIR /app
 
+# 安装所有必要的工具和依赖
 RUN apt-get update && apt-get install -y \
     git \
     curl \
+    wget \
     gradle \
-    maven
-
-RUN git clone https://github.com/Stirling-Tools/Stirling-PDF.git .
-
-RUN ./gradlew build
-
-FROM openjdk:17-jdk-slim
-
-WORKDIR /app
-
-COPY --from=builder /app/build/libs/*.jar /app/stirling-pdf.jar
-
-RUN mkdir -p /app/logs /app/configs /app/customFiles /usr/share/tessdata && \
-    chmod -R 777 /app/logs /app/configs /app/customFiles /usr/share/tessdata
-
-RUN apt-get update && apt-get install -y \
+    maven \
     libreoffice \
     poppler-utils \
     tesseract-ocr \
     tesseract-ocr-eng \
-    wget \
     python3 \
     python3-pip && \
     pip3 install --no-cache-dir unoconv WeasyPrint pdf2image pillow && \
-    cd /usr/share/tessdata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/chi_sim.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/chi_tra.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/jpn.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/kor.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/rus.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/fra.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/deu.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/spa.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/ita.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/por.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/vie.traineddata && \
-    wget https://github.com/tesseract-ocr/tessdata/raw/main/tha.traineddata && \
     rm -rf /var/lib/apt/lists/*
 
+# 创建必要的目录
+RUN mkdir -p /app/logs /app/configs /app/customFiles /usr/share/tessdata && \
+    chmod -R 777 /app/logs /app/configs /app/customFiles /usr/share/tessdata
+
+# 下载Tesseract语言包
+RUN cd /usr/share/tessdata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/chi_sim.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/chi_tra.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/jpn.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/kor.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/rus.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/fra.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/deu.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/spa.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/ita.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/por.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/vie.traineddata && \
+    wget -q https://github.com/tesseract-ocr/tessdata/raw/main/tha.traineddata
+
+# 克隆并构建项目
+RUN git clone https://github.com/Stirling-Tools/Stirling-PDF.git . && \
+    ./gradlew build && \
+    cp stirling-pdf/build/libs/*.jar /app/stirling-pdf.jar && \
+    rm -rf ~/.gradle /tmp/* && \
+    apt-get remove -y git gradle maven && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# 设置环境变量
+ENV JAVA_TOOL_OPTIONS="-XX:MaxRAMPercentage=75"
+ENV TESSDATA_PREFIX="/usr/share/tessdata"
+
+# 暴露端口7860（Hugging Face Spaces默认端口）
 EXPOSE 7860
 
+# 启动应用程序
 CMD ["java", "-Dserver.port=7860", "-Dserver.address=0.0.0.0", "-Dfile.encoding=UTF-8", "-jar", "/app/stirling-pdf.jar"]