chron: 优化镜像

jamebal · May 3, 2024 · de9577a · de9577a
1 parent 01a166f
commit de9577a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build_jdk17_ffmpeg_nvidia.yml b/.github/workflows/build_jdk17_ffmpeg_nvidia.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
-          context: docker/nvidia
+          context: .
           file: docker/nvidia/Dockerfile
           push: true
           tags: jmal/jdk17_ffmpeg_nvidia:latest

diff --git a/.github/workflows/build_jdk_ffmpeg.yml b/.github/workflows/build_jdk_ffmpeg.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
-          context: docker
+          context: .
           file: docker/Dockerfile
           push: true
           tags: jmal/jdk17_ffmpeg:latest

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -4,6 +4,11 @@ FROM eclipse-temurin:17-jre
 RUN apt-get update && \
     apt-get install -y ffmpeg libavcodec-extra
 
+# 设置环境变量
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8
+
 # 设置时区
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 

diff --git a/docker/nvidia/Dockerfile b/docker/nvidia/Dockerfile
@@ -12,11 +12,6 @@ ENV LANG=en_US.UTF-8 \
     NVIDIA_DRIVER_CAPABILITIES=compute,utility,video \
     NVIDIA_VISIBLE_DEVICES=all
 
-# 设置环境变量
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8
-
 FROM eclipse-temurin:17-jre AS java-base
 
 # 合并 CUDA 和 Java 环境