diff --git a/jdk/Dockerfile b/jdk/Dockerfile index e01fa4b2f5963d117ae2316fc1c1f16de0540cbe..1360819e684a78e5518c76397c7d2748aa75e590 100644 --- a/jdk/Dockerfile +++ b/jdk/Dockerfile @@ -27,6 +27,7 @@ ADD server-jre-8u172-linux-x64.tar.gz /usr/local/ COPY jce_policy-8/UnlimitedJCEPolicyJDK8/* /usr/local/jdk1.8.0_172/jre/lib/security/ COPY jce_policy-8/bcprov-jdk15on-157/bcprov-jdk15on-157.jar /usr/local/jdk1.8.0_172/jre/lib/ext COPY jce_policy-8/bcprov-jdk15on-157/java.security /usr/local/jdk1.8.0_172/jre/lib/security +COPY MSYH.TTC /usr/local/jdk1.8.0_172/jre/lib/fonts ENV TZ Asia/Shanghai ENV LANG zh_CN.UTF-8 diff --git a/jdk/MSYH.TTC b/jdk/MSYH.TTC new file mode 100644 index 0000000000000000000000000000000000000000..37c28de014d5a92911623a8a30a5cff0db20c014 Binary files /dev/null and b/jdk/MSYH.TTC differ diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 48d5a809a72a08ce3914940b696ec04339afd207..5af31e20cb16f1209cef55639c23fcb7e050e241 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -68,7 +68,7 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION ${JENKINS_VERSION:-2.155} +ENV JENKINS_VERSION ${JENKINS_VERSION:-2.156} # jenkins.war checksum, download will be validated using it ARG JENKINS_SHA=90e827e570d013551157e78249b50806f5c3953f9845b634f5c0fc542bf54b9a @@ -80,7 +80,7 @@ ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-w # see https://github.com/docker/docker/issues/8331 # RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war \ # && echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha256sum -c - -COPY jenkins-war-2.155.war /usr/share/jenkins/jenkins.war +COPY jenkins-war-2.156.war /usr/share/jenkins/jenkins.war ENV JENKINS_UC https://updates.jenkins.io ENV JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental diff --git a/jenkins/jenkins-war-2.155.war b/jenkins/jenkins-war-2.156.war similarity index 93% rename from jenkins/jenkins-war-2.155.war rename to jenkins/jenkins-war-2.156.war index 3e2ba2ee6b891d8bf8fa7591a2761c735ad95d07..865e735812985927b190be675db71b0f8c288e01 100644 Binary files a/jenkins/jenkins-war-2.155.war and b/jenkins/jenkins-war-2.156.war differ