From f9ea5e05ba594be48fea3f4dc785820855bac87f Mon Sep 17 00:00:00 2001
From: GuangJie1 <guangjiebai@gmail.com>
Date: Thu, 20 Jun 2024 15:22:22 +0800
Subject: [PATCH] bisheng-jdk: add these dependencies for apache poi

---
 bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile | 9 ++++++++-
 bisheng-jdk/1.8.0/22.03-lts/Dockerfile     | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile b/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
index 188e2ae5..7a610f95 100644
--- a/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
+++ b/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
@@ -10,6 +10,10 @@ ENV PATH $JAVA_HOME/bin:$PATH
 ENV LANG C.UTF-8
 ENV JAVA_VERSION 1.8.0_412-b11
 
+RUN yum update -y; \
+    yum install -y ca-certificates p11-kit; \
+    yum clean all
+
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x64"; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
@@ -19,12 +23,15 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
     mkdir -p ${JAVA_HOME}; \
     tar -xvf bisheng-jdk.tar.gz -C ${JAVA_HOME} --strip-components=1; \
     rm -f bisheng-jdk.tar.gz
-  
+
 RUN rm -rf "$JAVA_HOME/jre/lib/security/cacerts"; \
     ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/jre/lib/security/cacerts"; \
+    update-ca-trust; \
     alternatives --install /usr/bin/java java "$JAVA_HOME/bin/java" 20000; \
     alternatives --install /usr/bin/javac javac "$JAVA_HOME/bin/javac" 20000; \
     javac -version; \
     java -version
 
+RUN yum -y install freetype fontconfig
+
 CMD ["java"]
diff --git a/bisheng-jdk/1.8.0/22.03-lts/Dockerfile b/bisheng-jdk/1.8.0/22.03-lts/Dockerfile
index 72da01e3..94a0aebc 100644
--- a/bisheng-jdk/1.8.0/22.03-lts/Dockerfile
+++ b/bisheng-jdk/1.8.0/22.03-lts/Dockerfile
@@ -10,6 +10,10 @@ ENV PATH $JAVA_HOME/bin:$PATH
 ENV LANG C.UTF-8
 ENV JAVA_VERSION 1.8.0_412-b11
 
+RUN yum update -y; \
+    yum install -y ca-certificates p11-kit; \
+    yum clean all
+
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x64"; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
@@ -22,9 +26,12 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
 
 RUN rm -rf "$JAVA_HOME/jre/lib/security/cacerts"; \
     ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/jre/lib/security/cacerts"; \
+    update-ca-trust; \
     alternatives --install /usr/bin/java java "$JAVA_HOME/bin/java" 20000; \
     alternatives --install /usr/bin/javac javac "$JAVA_HOME/bin/javac" 20000; \
     javac -version; \
     java -version
 
+RUN yum -y install freetype fontconfig
+
 CMD ["java"]
-- 
Gitee