From a64fe56a42f1e449039e4a1c6fc6b175e8d63a15 Mon Sep 17 00:00:00 2001
From: andino66 <tawarrenjr@yahoo.com>
Date: Sun, 23 Jun 2024 19:57:34 -0500
Subject: [PATCH 1/3] fix for java

fix for java
---
 Dockerfile.dev     | 1 +
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 6cf28521..d1d0e80f 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -34,6 +34,7 @@ RUN apt-get update && apt-get install -y \
   git \
   curl \
   rlwrap \
+  openjdk-21-jre-headless \
   openjdk-17-jre-headless \
   openjdk-8-jre-headless \
   ca-certificates-java \
diff --git a/docker-compose.yml b/docker-compose.yml
index 353ecb32..994bf394 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   mineos:
-    image: hexparrot/mineos:latest
+    image: andino66/mineos:latest
     container_name: mineos_server
     networks:
       - mineos

From de46e13ad51b5266461f4afa3a664720c61b9618 Mon Sep 17 00:00:00 2001
From: andino66 <tawarrenjr@yahoo.com>
Date: Sun, 23 Jun 2024 20:01:24 -0500
Subject: [PATCH 2/3] Update Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index e79f2f40..c4e55976 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y \
   curl \
   rlwrap \
   unzip \
+  openjdk-21-jre-headless \
   openjdk-17-jre-headless \
   openjdk-8-jre-headless \
   ca-certificates-java \

From 73ec37bb4bcb5ef4e95448033a67d09404bfb29e Mon Sep 17 00:00:00 2001
From: andino66 <tawarrenjr@yahoo.com>
Date: Sun, 23 Jun 2024 20:36:29 -0500
Subject: [PATCH 3/3] java fix

---
 Dockerfile          | 1 -
 Dockerfile.dev      | 1 -
 install_rootless.sh | 8 ++++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c4e55976..6fe6749a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,6 @@ RUN apt-get update && apt-get install -y \
   rlwrap \
   unzip \
   openjdk-21-jre-headless \
-  openjdk-17-jre-headless \
   openjdk-8-jre-headless \
   ca-certificates-java \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/Dockerfile.dev b/Dockerfile.dev
index d1d0e80f..949a0b13 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -35,7 +35,6 @@ RUN apt-get update && apt-get install -y \
   curl \
   rlwrap \
   openjdk-21-jre-headless \
-  openjdk-17-jre-headless \
   openjdk-8-jre-headless \
   ca-certificates-java \
   && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
diff --git a/install_rootless.sh b/install_rootless.sh
index 47fdc506..0644eb6b 100644
--- a/install_rootless.sh
+++ b/install_rootless.sh
@@ -7,10 +7,10 @@ read -s UIPW
 # DOWNLOAD JAVA
 cd ~
 mkdir -p ~/.local/opt
-wget https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
-tar xf openjdk-17*
-mv ~/jdk-17.0.2 ~/.local/opt/
-JDK_PATH=$(realpath ~/.local/opt/jdk-17.0.2/bin)
+wget https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz
+tar xf openjdk-21*
+mv ~/jdk-21 ~/.local/opt/
+JDK_PATH=$(realpath ~/.local/opt/jdk-21/bin)
 
 # DOWNLOAD WEBUI FROM GITHUB
 git clone https://github.com/hexparrot/mineos-node