From 67d4ffdee4fc5d559b37943f7f47e1d8a29bb545 Mon Sep 17 00:00:00 2001
From: David Avendasora <daavendasora@ncmec.org>
Date: Thu, 8 Sep 2022 12:17:42 +0700
Subject: [PATCH 1/3] Correct Unbuntu .userPrefs directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

java.util.prefs.userRoot should simply point to ${USER_HOME}. Specifying “${USER_HOME}.java/.userPrefs” is redundant and causes java.util.prefs.userRoot to be defined as  “${USER_HOME}.java/.userPrefs/.java/.userPrefs”
---
 dockerfiles/ubuntu/is/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerfiles/ubuntu/is/Dockerfile b/dockerfiles/ubuntu/is/Dockerfile
index b0250b03..884277aa 100755
--- a/dockerfiles/ubuntu/is/Dockerfile
+++ b/dockerfiles/ubuntu/is/Dockerfile
@@ -126,7 +126,7 @@ USER ${USER_ID}
 WORKDIR ${USER_HOME}
 
 # set environment variables
-ENV JAVA_OPTS="-Djava.util.prefs.systemRoot=${USER_HOME}/.java -Djava.util.prefs.userRoot=${USER_HOME}/.java/.userPrefs" \
+ENV JAVA_OPTS="-Djava.util.prefs.systemRoot=${USER_HOME}/.java -Djava.util.prefs.userRoot=${USER_HOME}" \
     WORKING_DIRECTORY=${USER_HOME} \
     WSO2_SERVER_HOME=${WSO2_SERVER_HOME}
 

From cfbcb7de9d62bfc140eb2e9845713c699634eef5 Mon Sep 17 00:00:00 2001
From: David Avendasora <daavendasora@ncmec.org>
Date: Thu, 8 Sep 2022 12:26:23 +0700
Subject: [PATCH 2/3] Store Alpine & Centos java preferences in ~/.java

Pass java system properties to image using the JAVA_OPS environment variable, the same way the Unbuntu Dockerfile already does.

The directories were created earlier in the Dockerfile, but never set in the image.
---
 dockerfiles/alpine/is/Dockerfile | 3 ++-
 dockerfiles/centos/is/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dockerfiles/alpine/is/Dockerfile b/dockerfiles/alpine/is/Dockerfile
index 8661b120..9adf6376 100755
--- a/dockerfiles/alpine/is/Dockerfile
+++ b/dockerfiles/alpine/is/Dockerfile
@@ -125,7 +125,8 @@ USER ${USER_ID}
 WORKDIR ${USER_HOME}
 
 # set environment variables
-ENV WORKING_DIRECTORY=${USER_HOME} \
+ENV JAVA_OPTS="-Djava.util.prefs.systemRoot=${USER_HOME}/.java -Djava.util.prefs.userRoot=${USER_HOME}" \
+    WORKING_DIRECTORY=${USER_HOME} \
     WSO2_SERVER_HOME=${WSO2_SERVER_HOME}
 
 # expose ports
diff --git a/dockerfiles/centos/is/Dockerfile b/dockerfiles/centos/is/Dockerfile
index 31527787..1bdd267c 100755
--- a/dockerfiles/centos/is/Dockerfile
+++ b/dockerfiles/centos/is/Dockerfile
@@ -121,7 +121,8 @@ USER ${USER_ID}
 WORKDIR ${USER_HOME}
 
 # set environment variables
-ENV WORKING_DIRECTORY=${USER_HOME} \
+ENV JAVA_OPTS="-Djava.util.prefs.systemRoot=${USER_HOME}/.java -Djava.util.prefs.userRoot=${USER_HOME}" \
+    WORKING_DIRECTORY=${USER_HOME} \
     WSO2_SERVER_HOME=${WSO2_SERVER_HOME}
 
 # expose ports

From 5d14b9bf68a0483516d7f4e4347844a1fb033172 Mon Sep 17 00:00:00 2001
From: David Avendasora <daavendasora@ncmec.org>
Date: Thu, 9 Feb 2023 16:40:55 +0700
Subject: [PATCH 3/3] Use 6.1.0 distribution

---
 dockerfiles/ubuntu/is/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockerfiles/ubuntu/is/Dockerfile b/dockerfiles/ubuntu/is/Dockerfile
index 884277aa..d5a82224 100755
--- a/dockerfiles/ubuntu/is/Dockerfile
+++ b/dockerfiles/ubuntu/is/Dockerfile
@@ -65,8 +65,8 @@ ARG USER_GROUP_ID=802
 ARG USER_HOME=/home/${USER}
 # build arguments for WSO2 product installation
 ARG WSO2_SERVER_NAME=wso2is
-ARG WSO2_SERVER_VERSION=6.0.0
-# hosted wso2is-6.0.0 distribution URL
+ARG WSO2_SERVER_VERSION=6.1.0
+# hosted wso2is-6.1.0 distribution URL
 ARG WSO2_SERVER_DIST_URL=""
 ARG WSO2_SERVER_REPOSITORY=product-is
 ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}