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 188e2ae596f40a4849cf99fe4ffda0e74acb3f56..7a610f95dfc88d2975a655991358f1b95b461fdc 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 72da01e30a75d2b55943f9a3f3937ef72043dbbc..94a0aebc7029725a408e0e16859dc04ae26c54d6 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"]