From 1a384297fb032fbc4de885e91fccf500c506fc6c Mon Sep 17 00:00:00 2001 From: Lukas Prettenthaler Date: Thu, 18 Mar 2021 10:40:54 +0100 Subject: [PATCH] upgrade to openjdk 16, update cacerts --- Dockerfile | 6 +++--- Dockerfile.server | 16 ++++++++-------- cacerts | Bin 112414 -> 104920 bytes 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71e604b..266214d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:15.0.2-jdk-slim-buster +FROM openjdk:16-jdk-slim-buster -RUN ln -s /usr/local/openjdk-15 /docker-java-home +RUN ln -s /usr/local/openjdk-16 /docker-java-home -COPY cacerts /usr/local/openjdk-15/lib/security/ +COPY cacerts /usr/local/openjdk-16/lib/security/ diff --git a/Dockerfile.server b/Dockerfile.server index 4363501..d913206 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -1,24 +1,24 @@ -FROM openjdk:15.0.2-jdk-slim-buster as builder +FROM openjdk:16-jdk-slim-buster as builder -RUN /usr/local/openjdk-15/bin/jlink \ +RUN /usr/local/openjdk-16/bin/jlink \ --no-header-files \ --no-man-pages \ --add-modules java.base,java.prefs,java.naming,java.management,java.logging,java.sql,java.xml,java.compiler,java.instrument,java.desktop,jdk.management,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.localedata,jdk.naming.dns,jdk.unsupported \ --include-locales en-US,zh-CN,ru-RU,fr-FR,es-ES,en-GB,de-DE,pt-BR,en-CA,es-MX,it-IT,ja-JP \ --compress 2 \ - --output /usr/local/openjdk-15-slim + --output /usr/local/openjdk-16-slim -COPY cacerts /usr/local/openjdk-15-slim/lib/security/ +COPY cacerts /usr/local/openjdk-16-slim/lib/security/ FROM debian:buster-slim -ENV JAVA_HOME /usr/local/openjdk-15 +ENV JAVA_HOME /usr/local/openjdk-16 ENV PATH $JAVA_HOME/bin:$PATH ENV LANG C.UTF-8 -ENV JAVA_VERSION 15.0.2 +ENV JAVA_VERSION 16.0.0 -COPY --from=builder /usr/local/openjdk-15-slim /usr/local/openjdk-15 +COPY --from=builder /usr/local/openjdk-16-slim /usr/local/openjdk-16 -RUN ln -s /usr/local/openjdk-15 /docker-java-home +RUN ln -s /usr/local/openjdk-16 /docker-java-home CMD ["java", "--version"] diff --git a/cacerts b/cacerts index 79b88df09a565fd59a790a22c91a0e09e3a826e0..8c719c30c4c2a12dd73b1d65f0d9de857c94d111 100644 GIT binary patch delta 125 zcmV-@0D}LX?grSi1`Ph~{_Ow&00IC20A8^S#U8V6Bl;qjRHOkFv*=3IRFhP=5VNhK z3=*?cxFtuo=K=v`D7RQK0fz&(Oe+Bl2DjEY0Wt))-!uXD1Cvy^5VsgT0sA7i6lMXz fNVh4o0pSA_ejGnZ6v_v-dZ!umYg)vA?YlCeR`4<$ delta 6746 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