TravaOpenJDK to Jetbrains JBR for jdk17 support

This commit is contained in:
2023-09-05 15:34:38 -04:00
parent a2f80820eb
commit bf5701b959
5 changed files with 23 additions and 26 deletions

View File

@@ -4,8 +4,8 @@ FROM ubuntu:${ubuntu.version}
# Configure standard JAVA parameters
ENV JAVA_MEMORY_INIT=128m
ENV JAVA_MEMORY_MAX=512m
ENV JAVA_HOME=/usr/local/lib/jvm/java-openjdk-dcevm
ENV JRE_HOME=/usr/local/lib/jvm/java-openjdk-dcevm
ENV JAVA_HOME=/usr/local/lib/jvm/java-openjdk-jbr
ENV JRE_HOME=/usr/local/lib/jvm/java-openjdk-jbr
ENV JAVA_OPTS=
ENV ENABLE_HOTSWAP=true
ENV ENABLE_JDWP=true
@@ -15,16 +15,17 @@ ENV DISABLE_HOTSWAP_PLUGINS=
RUN apt update && \
apt -y install curl
# Download & Install DCEVM Java
# Download & Install JBR Java
RUN mkdir -p /usr/local/lib/jvm && \
curl -L https://github.com/TravaOpenJDK/trava-jdk-${dcevm.majorVersion}-dcevm/releases/download/dcevm-${dcevm.version}/${dcevm.filename} -o /usr/local/lib/jvm/java-openjdk-dcevm.tar.gz && \
curl -L https://cache-redirector.jetbrains.com/intellij-jbr/${jbr.filename} -o /usr/local/lib/jvm/java-openjdk-jbr.tar.gz && \
cd /usr/local/lib/jvm && \
tar xzvf java-openjdk-dcevm.tar.gz && \
mv dcevm-${dcevm.version} java-openjdk-dcevm && \
rm java-openjdk-dcevm.tar.gz
tar xzvf java-openjdk-jbr.tar.gz && \
mv ${jbr.basename} java-openjdk-jbr && \
mkdir -p java-openjdk-jbr/lib/hotswap && \
rm java-openjdk-jbr.tar.gz
# Download Hotswap Agent
RUN curl -L https://github.com/HotswapProjects/HotswapAgent/releases/download/RELEASE-${hotswap.version}/hotswap-agent-${hotswap.version}.jar -o /usr/local/lib/jvm/hotswap-agent.jar
RUN curl -L https://github.com/HotswapProjects/HotswapAgent/releases/download/RELEASE-${hotswap.version}/hotswap-agent-${hotswap.version}.jar -o /usr/local/lib/jvm/java-openjdk-jbr/lib/hotswap/hotswap-agent.jar
# Add directories for dynamic injection points
RUN mkdir -p /var/lib/jvm && cd /var/lib/jvm && \
@@ -33,7 +34,7 @@ RUN mkdir -p /var/lib/jvm && cd /var/lib/jvm && \
mkdir lib lib-extra1 lib-extra2 lib-extra3 lib-extra4 lib-extra5 lib-extra6 lib-extra7
# Add our Docker container initialization scripts
ADD maven/target/setenv.sh /usr/local/bin/${dcevm.prefix}-setenv.sh
ADD maven/target/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
ADD maven/target/docker-entrypoint.sh /usr/local/bin
RUN chmod 755 /usr/local/bin/docker-entrypoint.sh