Skip to content

Commit

Permalink
Support for JDK 23 and fix JDK 21 (#9)
Browse files Browse the repository at this point in the history
* Fix 22-JDK from using 21
* Add 23-JDK
* Add 23-JDK to README
  • Loading branch information
flerouwu authored Oct 14, 2024
1 parent fce9fcc commit 3513154
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 10 deletions.
1 change: 1 addition & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- 20-JDK
- 21-JDK
- 22-JDK
- 23-JDK
- 11-EE
- 17-EE
steps:
Expand Down
4 changes: 2 additions & 2 deletions 22-JDK/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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, <[email protected]>

Expand Down
48 changes: 48 additions & 0 deletions 23-JDK/Dockerfile
Original file line number Diff line number Diff line change
@@ -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, <[email protected]>

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"]
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` ||

___

Expand Down

0 comments on commit 3513154

Please sign in to comment.