diff --git a/CHANGELOG.md b/CHANGELOG.md index 85822bd..ec828a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 20267-RC2 (2019/07/22) + +* OpenJDK JRE 12 +* Alpine Linux 3.10 + ## 20267-RC1 (2019/07/19) * JetBrains License Server 20267 diff --git a/Dockerfile b/Dockerfile index 6b74d28..cbb85e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM adoptopenjdk/openjdk12:alpine-jre ARG BUILD_DATE ARG VCS_REF @@ -24,7 +24,8 @@ COPY entrypoint.sh /entrypoint.sh RUN apk --update --no-cache add \ tzdata \ && apk --update --no-cache add -t build-dependencies \ - curl zip \ + curl \ + zip \ && mkdir -p "$JLS_PATH" \ && curl -L "https://download.jetbrains.com/lcsrv/license-server-installer.zip" -o "/tmp/jls.zip" \ && echo "$JLS_SHA256 /tmp/jls.zip" | sha256sum -c - | grep OK \