From ace677abb66a13cf3f7c9f1599225a86d7bb8b3b Mon Sep 17 00:00:00 2001
From: Alex <admin@softwarenoob.com>
Date: Sun, 21 Jul 2024 17:12:56 +0300
Subject: [PATCH] feat: update and add shipilev-openjdk

---
 .github/workflows/java-shenandoah.yml |  3 ++-
 README.md                             |  6 ++++--
 java-shenandoah/21/Dockerfile         | 23 +++++++++++++++++++++++
 java-shenandoah/8/Dockerfile          |  2 +-
 4 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 java-shenandoah/21/Dockerfile

diff --git a/.github/workflows/java-shenandoah.yml b/.github/workflows/java-shenandoah.yml
index df48aeb..a393431 100644
--- a/.github/workflows/java-shenandoah.yml
+++ b/.github/workflows/java-shenandoah.yml
@@ -1,4 +1,4 @@
-name: build java_shenandoah
+name: build java_shenandoah (shipilev openjdk)
 
 on:
   workflow_dispatch:
@@ -29,6 +29,7 @@ jobs:
           - 8
           - 11
           - 17
+          - 21
     steps:
       - name: Git checkout for Github repository workspace
         uses: actions/checkout@v4
diff --git a/README.md b/README.md
index 28057f6..2f7ebcb 100644
--- a/README.md
+++ b/README.md
@@ -143,9 +143,9 @@ Navigate to `Admin Panel -> Nests -> Select your egg`. Add Docker image URL(s) f
 - [Java 21 OpenJ9](https://github.com/Software-Noob/pterodactyl-images/tree/main/java-openj9/21)
   - `ghcr.io/software-noob/pterodactyl-images:java_21_openj9`
 
-### Java Shenandoah Nightly [AMD64/ARM64]
+### Java Shipilev Experimental [AMD64/ARM64]
 
-These are nightly builds. Shenandoah GC is by default shipped with Azul, Corretto and Temurin starting with Java 11
+These are [shipilev experimental builds.](https://builds.shipilev.net/) If you're looking for Shenandoah GC, it is also by default shipped with at least Azul, Corretto and Temurin images starting with Java 11.
 
 - [Java 8 Shenandoah](https://github.com/Software-Noob/pterodactyl-images/tree/main/java-shenandoah/8)
   - `ghcr.io/software-noob/pterodactyl-images:java_8_shenandoah`
@@ -153,6 +153,8 @@ These are nightly builds. Shenandoah GC is by default shipped with Azul, Corrett
   - `ghcr.io/software-noob/pterodactyl-images:java_11_shenandoah`
 - [Java 17 Shenandoah](https://github.com/Software-Noob/pterodactyl-images/tree/main/java-shenandoah/17)
   - `ghcr.io/software-noob/pterodactyl-images:java_17_shenandoah`
+- [Java 21 Shenandoah](https://github.com/Software-Noob/pterodactyl-images/tree/main/java-shenandoah/21)
+  - `ghcr.io/software-noob/pterodactyl-images:java_21_shenandoah`
 
 ### Node.js [AMD64/ARM64]
 
diff --git a/java-shenandoah/21/Dockerfile b/java-shenandoah/21/Dockerfile
new file mode 100644
index 0000000..e719d8c
--- /dev/null
+++ b/java-shenandoah/21/Dockerfile
@@ -0,0 +1,23 @@
+FROM        shipilev/openjdk:21
+
+LABEL       author="Softwarenoob" maintainer="admin@softwarenoob.com"
+LABEL       org.opencontainers.image.source="https://github.com/Software-Noob/pterodactyl-images"
+LABEL       org.opencontainers.image.licenses="MIT"
+
+RUN         apt-get update -y \
+            && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+            && apt-get clean \
+            && rm -rf /var/lib/apt/lists/* \
+            && useradd -m -d /home/container container \
+            && locale-gen en_US.UTF-8
+
+ENV         LC_ALL=en_US.UTF-8
+ENV         LANG=en_US.UTF-8
+ENV         LANGUAGE=en_US.UTF-8
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/java-shenandoah/8/Dockerfile b/java-shenandoah/8/Dockerfile
index 0fbf7fc..2723591 100644
--- a/java-shenandoah/8/Dockerfile
+++ b/java-shenandoah/8/Dockerfile
@@ -1,4 +1,4 @@
-FROM        shipilev/openjdk-shenandoah:8
+FROM        shipilev/openjdk:8
 
 LABEL       author="Softwarenoob" maintainer="admin@softwarenoob.com"
 LABEL       org.opencontainers.image.source="https://github.com/Software-Noob/pterodactyl-images"