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 79b88df..8c719c3 100644 Binary files a/cacerts and b/cacerts differ