From fce9fcc87970ec033c3824dddda42a04e6a5873a Mon Sep 17 00:00:00 2001
From: Jacek Maciejak <18230443+RikoDEV@users.noreply.github.com>
Date: Mon, 25 Mar 2024 19:11:19 +0100
Subject: [PATCH] GraalVM 22

---
 .github/workflows/docker-image.yml |  1 +
 17-JDK/Dockerfile                  |  2 +-
 21-JDK/Dockerfile                  |  4 +--
 22-JDK/Dockerfile                  | 48 ++++++++++++++++++++++++++++++
 README.md                          | 44 +++++----------------------
 5 files changed, 60 insertions(+), 39 deletions(-)
 create mode 100644 22-JDK/Dockerfile

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index fc99c94..53c966e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -20,6 +20,7 @@ jobs:
           - 17-JDK
           - 20-JDK
           - 21-JDK
+          - 22-JDK
           - 11-EE
           - 17-EE
     steps:
diff --git a/17-JDK/Dockerfile b/17-JDK/Dockerfile
index 850f24e..4ed8814 100644
--- a/17-JDK/Dockerfile
+++ b/17-JDK/Dockerfile
@@ -6,7 +6,7 @@
 FROM ubuntu:22.04
 
 ARG TARGETPLATFORM
-ARG GRAAL_VERSION=17.0.8
+ARG GRAAL_VERSION=17.0.9
 ARG JAVA_VERSION=17
 
 MAINTAINER RikoDEV, <kontakt@riko.dev>
diff --git a/21-JDK/Dockerfile b/21-JDK/Dockerfile
index 62869e7..8b36868 100644
--- a/21-JDK/Dockerfile
+++ b/21-JDK/Dockerfile
@@ -3,10 +3,10 @@
 # Environment: Java
 # Minimum Panel Version: 1.7.0
 # ----------------------------------
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG TARGETPLATFORM
-ARG GRAAL_VERSION=21.0.0
+ARG GRAAL_VERSION=21.0.2
 ARG JAVA_VERSION=21
 
 MAINTAINER RikoDEV, <kontakt@riko.dev>
diff --git a/22-JDK/Dockerfile b/22-JDK/Dockerfile
new file mode 100644
index 0000000..62869e7
--- /dev/null
+++ b/22-JDK/Dockerfile
@@ -0,0 +1,48 @@
+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: Java
+# Minimum Panel Version: 1.7.0
+# ----------------------------------
+FROM ubuntu:22.04
+
+ARG TARGETPLATFORM
+ARG GRAAL_VERSION=21.0.0
+ARG JAVA_VERSION=21
+
+MAINTAINER RikoDEV, <kontakt@riko.dev>
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Default to UTF-8 file.encoding
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+RUN apt-get update -y \
+  && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2 \
+  && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+  && locale-gen en_US.UTF-8 \
+  && case ${TARGETPLATFORM} in \
+         "linux/amd64")  ARCH=x64  ;; \
+         "linux/arm64")  ARCH=aarch64  ;; \
+    esac \
+  && curl --retry 3 -Lfso /tmp/graalvm.tar.gz https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/graalvm-community-jdk-${GRAAL_VERSION}_linux-${ARCH}_bin.tar.gz \
+  && mkdir -p /opt/java/graalvm \
+  && cd /opt/java/graalvm \
+  && tar -xf /tmp/graalvm.tar.gz --strip-components=1 \
+  && export PATH="/opt/java/graalvm/bin:$PATH" \
+  && rm -rf /var/lib/apt/lists/* \
+  && rm -rf /tmp/graalvm.tar.gz
+
+ENV JAVA_HOME=/opt/java/graalvm \
+    PATH="/opt/java/graalvm/bin:$PATH"
+
+# Step 2 - add pterodactyl stuff
+RUN useradd -d /home/container -m container
+
+USER        container
+ENV         USER=container HOME=/home/container
+
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+
+CMD         ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/README.md b/README.md
index 2082ec3..c73c0f3 100644
--- a/README.md
+++ b/README.md
@@ -8,42 +8,14 @@ ___
 
 ## Docker Container Configuration
 
-### Version: GraalVM (CE, Community Edition) 22.3.3 | Java 11
-
-> ghcr.io/rikodev/pterodactyl-graalvm:11
-
-**Enterprise Edition (EE):**
-
-> ghcr.io/rikodev/pterodactyl-graalvm:11-EE
-
-### Version: GraalVM (CE, Community Edition) 22.3.3 | Java 17
-
-> ghcr.io/rikodev/pterodactyl-graalvm:17
-
-**Enterprise Edition (EE):**
-
-> ghcr.io/rikodev/pterodactyl-graalvm:17-EE
-
-**Java Development Kit Edition (JDK) 17.0.8:**
-> ghcr.io/rikodev/pterodactyl-graalvm:17-JDK
-
-### Version: GraalVM (CE, Community Edition) 22.3.1 | Java 19
-
-> ghcr.io/rikodev/pterodactyl-graalvm:19
-
-**Enterprise Edition (EE):** Not available
-
-### Version: GraalVM JDK 20.0.2 | Java 20
-
-> ghcr.io/rikodev/pterodactyl-graalvm:20-JDK
-
-**Enterprise Edition (EE):** Not available
-
-### Version: GraalVM JDK 21.0.0 | Java 21
-
-> ghcr.io/rikodev/pterodactyl-graalvm:20-JDK
-
-**Enterprise Edition (EE):** Not available
+| Java | Standard                               	| JDK                                        	| Enterprise                                	|
+|------	|----------------------------------------	|--------------------------------------------	|-------------------------------------------	|
+| 11    | `ghcr.io/rikodev/pterodactyl-graalvm:11` 	| ❌                                          	| `ghcr.io/rikodev/pterodactyl-graalvm:11-EE` 	|
+| 17    | `ghcr.io/rikodev/pterodactyl-graalvm:17` 	| `ghcr.io/rikodev/pterodactyl-graalvm:17-JDK` 	| `ghcr.io/rikodev/pterodactyl-graalvm:17-EE` 	|
+| 19   	| `ghcr.io/rikodev/pterodactyl-graalvm:19` 	| ❌                                          	| ❌                                         	|
+| 20   	| ❌                                     	| `ghcr.io/rikodev/pterodactyl-graalvm:20-JDK` 	| ❌                                         	|
+| 21   	| ❌                                     	| `ghcr.io/rikodev/pterodactyl-graalvm:21-JDK` 	| ❌                                         	|
+| 22    | ❌                                     	| `ghcr.io/rikodev/pterodactyl-graalvm:22-JDK` 	| ❌                                         	|
 
 ___