From f86585c3ccc7fe74fbb3b1d0251d93f263d70fe1 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Thu, 25 Apr 2024 22:57:03 +0100
Subject: [PATCH] Update Dockerfile to use Java 21

---
 .github/workflows/ci.yml     | 3 +++
 standalone/docker/Dockerfile | 7 +++----
 standalone/docker/readme.md  | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32d2f74c0..28be5e742 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,6 +86,9 @@ jobs:
           name: standalone-binary
           path: standalone/docker/
 
+      - name: Remove version number from jar artifact name
+        run: mv standalone/docker/LuckPerms-Standalone-*.jar standalone/docker/luckperms-standalone.jar
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
diff --git a/standalone/docker/Dockerfile b/standalone/docker/Dockerfile
index 70c4b3cee..6c9ae7ddc 100644
--- a/standalone/docker/Dockerfile
+++ b/standalone/docker/Dockerfile
@@ -1,5 +1,5 @@
-FROM alpine
-RUN apk add --no-cache openjdk17 netcat-openbsd
+FROM eclipse-temurin:21-alpine
+RUN apk add --no-cache netcat-openbsd
 
 # create a simple 'send' command that will allow users
 # to run, for example: docker exec <container> send lp info
@@ -12,8 +12,7 @@ USER app
 
 # copy jar file into image
 WORKDIR /opt/luckperms
-COPY LuckPerms-Standalone-*.jar .
-RUN mv * luckperms-standalone.jar
+COPY luckperms-standalone.jar .
 
 # create volume for data directory
 RUN mkdir data
diff --git a/standalone/docker/readme.md b/standalone/docker/readme.md
index 55a149f33..9898846ba 100644
--- a/standalone/docker/readme.md
+++ b/standalone/docker/readme.md
@@ -2,4 +2,5 @@
 
 1. Compile with Gradle
 2. `cd standalone/loader/build/libs`
-3. `docker build . -t luckperms:luckperms -f ../../../docker/Dockerfile`
+3. `cp LuckPerms-*.jar luckperms-standalone.jar`
+4. `docker build . -t luckperms -f ../../../docker/Dockerfile`