From 94467273c5fa8d4d8f26f798bd9351a17c218ad9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 09 七月 2024 16:37:05 +0800
Subject: [PATCH] update 优化 更换docker镜像底层系统 避免无字体情况
---
ruoyi-extend/ruoyi-snailjob-server/Dockerfile | 4 ++--
ruoyi-extend/ruoyi-monitor-admin/Dockerfile | 4 ++--
ruoyi-admin/Dockerfile | 8 ++------
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile
index 10dabc4..737cbfc 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -1,6 +1,6 @@
# 璐濆皵瀹為獙瀹� Spring 瀹樻柟鎺ㄨ崘闀滃儚 JDK涓嬭浇鍦板潃 https://bell-sw.com/pages/downloads/
-FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
-#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
+FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
+#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
#FROM findepi/graalvm:java17-native
LABEL maintainer="Lion Li"
@@ -10,10 +10,6 @@
/ruoyi/skywalking/agent
WORKDIR /ruoyi/server
-
-# 琛ュ叏alpine闀滃儚缂哄け瀛椾綋闂
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-RUN apk add fontconfig && apk add --update ttf-dejavu && fc-cache --force
ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
index 6fbee5f..99aaa74 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
+++ b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
@@ -1,6 +1,6 @@
# 璐濆皵瀹為獙瀹� Spring 瀹樻柟鎺ㄨ崘闀滃儚 JDK涓嬭浇鍦板潃 https://bell-sw.com/pages/downloads/
-FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
-#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
+FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
+#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
#FROM findepi/graalvm:java17-native
LABEL maintainer="Lion Li"
diff --git a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile b/ruoyi-extend/ruoyi-snailjob-server/Dockerfile
index 8200c6f..a66ca66 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile
+++ b/ruoyi-extend/ruoyi-snailjob-server/Dockerfile
@@ -1,6 +1,6 @@
# 璐濆皵瀹為獙瀹� Spring 瀹樻柟鎺ㄨ崘闀滃儚 JDK涓嬭浇鍦板潃 https://bell-sw.com/pages/downloads/
-FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
-#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
+FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
+#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
#FROM findepi/graalvm:java17-native
LABEL maintainer="Lion Li"
--
Gitblit v1.9.3