diff --git a/Dockerfile b/Dockerfile index 5a50daa..e8800e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,14 +61,11 @@ LABEL author "Olivier Le Bris" LABEL maintainer "tech@zogg.fr" LABEL org.opencontainers.image.source "https://zogg.fr" -ENV GRAALVERSION $GRAALVERSION +ENV GRAALVERSION 20.0.2-graal ENV LANG C.UTF-8 -ENV GRAALVM_YEAR_VERSION $GRAALVM_YEAR_VERSION -ENV GRAALVM_MAJOR_VERSION $GRAALVM_MAJOR_VERSION -ENV GRAALVM_MINOR_VERSION $GRAALVM_MINOR_VERSION -ENV JAVA_VERSION $JAVA_VERSION -ENV JAVA_HOME $JAVA_HOME -ENV PATH $JAVA_HOME/bin:${PATH} +ENV JAVA_VERSION 20 +ENV JAVA_HOME /opt/graalvm +ENV PATH /opt/graalvm/bin:${PATH} USER root WORKDIR / @@ -86,12 +83,12 @@ RUN useradd -d /home/container -m container -s /bin/bash -p 'none' \ # Install SDKMAN! and GraalVM specified version RUN curl -s "https://get.sdkman.io" | bash \ - && source "$SDKMAN/bin/sdkman-init.sh" \ - && sdk install java $GRAALVERSION + && source "/root/.sdkman/bin/sdkman-init.sh" \ + && sdk install java 20.0.2-graal # Copy GraalVM files to destination folder RUN mkdir -p /opt/graalvm \ - && cp -rf $SDKMAN/candidates/java/$GRAALVERSION/. /opt/graalvm/ \ + && cp -rf /root/.sdkman/candidates/java/20.0.2-graal/. /opt/graalvm/ \ && chown -R container:container /opt/graalvm # Setup GraalVM as default Java interpreter @@ -108,10 +105,10 @@ RUN mkdir -p /usr/java \ # Uninstall SDKMAN! and do some cleanup USER root WORKDIR / -RUN source "$SDKMAN/bin/sdkman-init.sh" \ - && sdk uninstall java $GRAALVERSION --force \ +RUN source "/root/.sdkman/bin/sdkman-init.sh" \ + && sdk uninstall java 20.0.2-graal --force \ && sdk flush \ - && rm -rf $SDKMAN \ + && rm -rf /root/.sdkman \ && apt autoremove -y # Setup Pterodactyl necessary context