From 95ab923d1a49c20214040805bcd2607c88be09cc Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Tue, 30 Sep 2025 19:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/Dockerfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile
index 795f295..80737bf 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -24,18 +24,18 @@ COPY ruoyi-video/src ./ruoyi-video/src
 # 构建项目（跳过测试和enforcer检查以避免依赖冲突）
 RUN mvn clean package -DskipTests -Denforcer.skip=true -pl ruoyi-admin -am
 
-# 运行阶段
-FROM eclipse-temurin:17-jre-alpine
+# 运行阶段 - 使用Debian而不是Alpine以支持JavaCV/FFmpeg
+FROM eclipse-temurin:17-jre
 
-# 安装必要的工具和JavaCV依赖
-RUN apk add --no-cache \
+# 安装必要的工具和JavaCV/FFmpeg依赖
+RUN apt-get update && apt-get install -y \
     curl \
-    tzdata \
-    libstdc++ \
-    libgomp \
-    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    libgomp1 \
+    libva-drm2 \
+    libva2 \
+    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && echo "Asia/Shanghai" > /etc/timezone \
-    && apk del tzdata
+    && rm -rf /var/lib/apt/lists/*
 
 # 设置工作目录
 WORKDIR /app