From 35131543864d343d8cb4246eb95029c2997e6c74 Mon Sep 17 00:00:00 2001
From: Flero <flero@flero.dev>
Date: Tue, 15 Oct 2024 04:20:58 +1030
Subject: [PATCH] Support for JDK 23 and fix JDK 21 (#9)

* Fix 22-JDK from using 21
* Add 23-JDK
* Add 23-JDK to README
---
 .github/workflows/docker-image.yml |  1 +
 22-JDK/Dockerfile                  |  4 +--
 23-JDK/Dockerfile                  | 48 ++++++++++++++++++++++++++++++
 README.md                          | 17 ++++++-----
 4 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 23-JDK/Dockerfile

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 53c966e..e2ebad2 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -21,6 +21,7 @@ jobs:
           - 20-JDK
           - 21-JDK
           - 22-JDK
+          - 23-JDK
           - 11-EE
           - 17-EE
     steps:
diff --git a/22-JDK/Dockerfile b/22-JDK/Dockerfile
index 62869e7..0a01a66 100644
--- a/22-JDK/Dockerfile
+++ b/22-JDK/Dockerfile
@@ -6,8 +6,8 @@
 FROM ubuntu:22.04
 
 ARG TARGETPLATFORM
-ARG GRAAL_VERSION=21.0.0
-ARG JAVA_VERSION=21
+ARG GRAAL_VERSION=22.0.2
+ARG JAVA_VERSION=22
 
 MAINTAINER RikoDEV, <kontakt@riko.dev>
 
diff --git a/23-JDK/Dockerfile b/23-JDK/Dockerfile
new file mode 100644
index 0000000..92bb0f5
--- /dev/null
+++ b/23-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=23.0.0
+ARG JAVA_VERSION=23
+
+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 c73c0f3..b604de0 100644
--- a/README.md
+++ b/README.md
@@ -8,14 +8,15 @@ ___
 
 ## Docker Container Configuration
 
-| 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` 	| ❌                                         	|
+| 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`	| ❌                                          |
+| 23   | ❌                                     	 | `ghcr.io/rikodev/pterodactyl-graalvm:23-JDK`	| ❌                                          |
 
 ___