fixed Dockerfile
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
2023-08-13 19:21:02 +02:00
parent fac963c036
commit 8613a0aa0c
2 changed files with 25 additions and 13 deletions

View File

@ -11,6 +11,16 @@ steps:
from_secret: docker_password from_secret: docker_password
repo: uzurka/graalvm23 repo: uzurka/graalvm23
tags: latest tags: latest
build_args:
- TZ=Europe/Paris
- CONCURRENCY=$(nproc)
- GRAALVERSION=20.0.2-graal
- SDKMAN=/root/.sdkman
- GRAALVM_YEAR_VERSION=20
- GRAALVM_MAJOR_VERSION=0
- GRAALVM_MINOR_VERSION=2
- JAVA_VERSION=20
- JAVA_HOME=/opt/graalvm
platforms: platforms:
- linux/amd64 - linux/amd64
- linux/arm64 - linux/arm64

View File

@ -44,8 +44,7 @@ ARG GRAALVM_MINOR_VERSION
ARG JAVA_VERSION ARG JAVA_VERSION
ARG JAVA_HOME ARG JAVA_HOME
COPY platform.sh ./ COPY platform.sh .
RUN chmod +x ./platform.sh
RUN ./platform.sh RUN ./platform.sh
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
@ -61,11 +60,14 @@ LABEL author "Olivier Le Bris"
LABEL maintainer "tech@zogg.fr" LABEL maintainer "tech@zogg.fr"
LABEL org.opencontainers.image.source "https://zogg.fr" LABEL org.opencontainers.image.source "https://zogg.fr"
ENV GRAALVERSION 20.0.2-graal ENV GRAALVERSION $GRAALVERSION
ENV LANG C.UTF-8 ENV LANG C.UTF-8
ENV JAVA_VERSION 20 ENV GRAALVM_YEAR_VERSION $GRAALVM_YEAR_VERSION
ENV JAVA_HOME /opt/graalvm ENV GRAALVM_MAJOR_VERSION $GRAALVM_MAJOR_VERSION
ENV PATH /opt/graalvm/bin:${PATH} ENV GRAALVM_MINOR_VERSION $GRAALVM_MINOR_VERSION
ENV JAVA_VERSION $JAVA_VERSION
ENV JAVA_HOME $JAVA_HOME
ENV PATH $JAVA_HOME/bin:${PATH}
USER root USER root
WORKDIR / WORKDIR /
@ -83,12 +85,12 @@ RUN useradd -d /home/container -m container -s /bin/bash -p 'none' \
# Install SDKMAN! and GraalVM specified version # Install SDKMAN! and GraalVM specified version
RUN curl -s "https://get.sdkman.io" | bash \ RUN curl -s "https://get.sdkman.io" | bash \
&& source "/root/.sdkman/bin/sdkman-init.sh" \ && source "$SDKMAN/bin/sdkman-init.sh" \
&& sdk install java 20.0.2-graal && sdk install java $GRAALVERSION
# Copy GraalVM files to destination folder # Copy GraalVM files to destination folder
RUN mkdir -p /opt/graalvm \ RUN mkdir -p /opt/graalvm \
&& cp -rf /root/.sdkman/candidates/java/20.0.2-graal/. /opt/graalvm/ \ && cp -rf $SDKMAN/candidates/java/$GRAALVERSION/. /opt/graalvm/ \
&& chown -R container:container /opt/graalvm && chown -R container:container /opt/graalvm
# Setup GraalVM as default Java interpreter # Setup GraalVM as default Java interpreter
@ -105,10 +107,10 @@ RUN mkdir -p /usr/java \
# Uninstall SDKMAN! and do some cleanup # Uninstall SDKMAN! and do some cleanup
USER root USER root
WORKDIR / WORKDIR /
RUN source "/root/.sdkman/bin/sdkman-init.sh" \ RUN source "$SDKMAN/bin/sdkman-init.sh" \
&& sdk uninstall java 20.0.2-graal --force \ && sdk uninstall java $GRAALVERSION --force \
&& sdk flush \ && sdk flush \
&& rm -rf /root/.sdkman \ && rm -rf $SDKMAN \
&& apt autoremove -y && apt autoremove -y
# Setup Pterodactyl necessary context # Setup Pterodactyl necessary context
@ -121,4 +123,4 @@ COPY _bashrc /home/container/.bashrc
COPY _entrypoint.sh /entrypoint.sh COPY _entrypoint.sh /entrypoint.sh
# Run Pterodactyl entrypoint # Run Pterodactyl entrypoint
CMD ["/bin/bash", "/entrypoint.sh"] CMD ["/bin/bash", "/entrypoint.sh"]