From 8613a0aa0c26e4dd3dd41172c58b8353112a3e5c Mon Sep 17 00:00:00 2001
From: uzurka <me@uzurka.fr>
Date: Sun, 13 Aug 2023 19:21:02 +0200
Subject: [PATCH] fixed Dockerfile

---
 .drone.yml | 10 ++++++++++
 Dockerfile | 28 +++++++++++++++-------------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 6944b73..079cccf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,6 +11,16 @@ steps:
       from_secret: docker_password
     repo: uzurka/graalvm23
     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: 
       - linux/amd64
       - linux/arm64
diff --git a/Dockerfile b/Dockerfile
index e8800e9..7fe8611 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,8 +44,7 @@ ARG     GRAALVM_MINOR_VERSION
 ARG     JAVA_VERSION
 ARG     JAVA_HOME
 
-COPY    platform.sh ./
-RUN     chmod +x ./platform.sh
+COPY    platform.sh .
 RUN     ./platform.sh
 
 SHELL   ["/bin/bash", "-c"]
@@ -61,11 +60,14 @@ LABEL   author                                  "Olivier Le Bris"
 LABEL   maintainer                              "tech@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     JAVA_VERSION                            20
-ENV     JAVA_HOME                               /opt/graalvm
-ENV     PATH                                    /opt/graalvm/bin:${PATH}
+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}
 
 USER    root
 WORKDIR /
@@ -83,12 +85,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 "/root/.sdkman/bin/sdkman-init.sh" \
-        &&      sdk install java 20.0.2-graal
+        &&      source "$SDKMAN/bin/sdkman-init.sh" \
+        &&      sdk install java $GRAALVERSION
 
 # Copy GraalVM files to destination folder
 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
 
 # Setup GraalVM as default Java interpreter
@@ -105,10 +107,10 @@ RUN             mkdir -p /usr/java \
 # Uninstall SDKMAN! and do some cleanup
 USER    root
 WORKDIR /
-RUN             source "/root/.sdkman/bin/sdkman-init.sh" \
-        &&      sdk uninstall java 20.0.2-graal --force \
+RUN             source "$SDKMAN/bin/sdkman-init.sh" \
+        &&      sdk uninstall java $GRAALVERSION --force \
         &&      sdk flush \
-        &&      rm -rf /root/.sdkman \
+        &&      rm -rf $SDKMAN \
         &&      apt autoremove -y
 
 # Setup Pterodactyl necessary context
@@ -121,4 +123,4 @@ COPY    _bashrc                            /home/container/.bashrc
 COPY    _entrypoint.sh	                /entrypoint.sh
 
 # Run Pterodactyl entrypoint
-CMD     ["/bin/bash", "/entrypoint.sh"]
+CMD     ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file