From 5ce7098a12ba613b10b32c498b4e4414af1d8a44 Mon Sep 17 00:00:00 2001
From: Kirby Chin <37311900+kabicin@users.noreply.github.com>
Date: Wed, 19 Feb 2025 09:51:26 -0500
Subject: [PATCH 1/5] Update kernel Dockerfiles for serviceability

---
 ga/latest/kernel/Dockerfile.ubi.ibmjava8      | 21 ++++++++++++++-----
 ga/latest/kernel/Dockerfile.ubi.openjdk11     | 21 ++++++++++++++-----
 ga/latest/kernel/Dockerfile.ubi.openjdk17     | 21 ++++++++++++++-----
 ga/latest/kernel/Dockerfile.ubi.openjdk8      | 21 ++++++++++++++-----
 .../kernel/Dockerfile.ubi9-minimal.openjdk21  | 21 ++++++++++++++-----
 ga/latest/kernel/Dockerfile.ubuntu.ibmjava8   | 21 ++++++++++++++-----
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11  | 21 ++++++++++++++-----
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17  | 21 ++++++++++++++-----
 .../kernel/helpers/runtime/docker-server.sh   |  6 ++++++
 9 files changed, 134 insertions(+), 40 deletions(-)

diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index 8d41f509..3ac91577 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -131,8 +131,7 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /logs \
-    && mkdir /etc/wlp \
+RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -155,12 +154,24 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && mkdir -p /opt/ibm/links \
+    && chown -R 1001:0 /opt/ibm/links \
+    && chmod -R g+rw /opt/ibm/links \
+    && mkdir -p /opt/ibm/logs \
+    && chown -R 1001:0 /opt/ibm/logs \
+    && chmod -R g+rw /opt/ibm/logs \
+    && mkdir -p /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
+
+USER 1001
+RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
+USER root
+RUN ln -s /opt/ibm/links/logs /logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index cbae7985..ec2719a7 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -132,8 +132,7 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /logs \
-    && mkdir /etc/wlp \
+RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -156,13 +155,25 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && mkdir -p /opt/ibm/links \
+    && chown -R 1001:0 /opt/ibm/links \
+    && chmod -R g+rw /opt/ibm/links \
+    && mkdir -p /opt/ibm/logs \
+    && chown -R 1001:0 /opt/ibm/logs \
+    && chmod -R g+rw /opt/ibm/logs \
+    && mkdir -p /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
+
+USER 1001
+RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
+USER root
+RUN ln -s /opt/ibm/links/logs /logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index c08c884b..4e9057ef 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -131,8 +131,7 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /logs \
-    && mkdir /etc/wlp \
+RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -155,13 +154,25 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && mkdir -p /opt/ibm/links \
+    && chown -R 1001:0 /opt/ibm/links \
+    && chmod -R g+rw /opt/ibm/links \
+    && mkdir -p /opt/ibm/logs \
+    && chown -R 1001:0 /opt/ibm/logs \
+    && chmod -R g+rw /opt/ibm/logs \
+    && mkdir -p /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
+
+USER 1001
+RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
+USER root
+RUN ln -s /opt/ibm/links/logs /logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index b9488080..b12a5a50 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -131,8 +131,7 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /logs \
-    && mkdir /etc/wlp \
+RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -155,13 +154,25 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && mkdir -p /opt/ibm/links \
+    && chown -R 1001:0 /opt/ibm/links \
+    && chmod -R g+rw /opt/ibm/links \
+    && mkdir -p /opt/ibm/logs \
+    && chown -R 1001:0 /opt/ibm/logs \
+    && chmod -R g+rw /opt/ibm/logs \
+    && mkdir -p /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
+
+USER 1001
+RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
+USER root
+RUN ln -s /opt/ibm/links/logs /logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
index a7ffb504..3c086a2d 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
@@ -131,8 +131,7 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /logs \
-    && mkdir /etc/wlp \
+RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -155,13 +154,25 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && mkdir -p /opt/ibm/links \
+    && chown -R 1001:0 /opt/ibm/links \
+    && chmod -R g+rw /opt/ibm/links \
+    && mkdir -p /opt/ibm/logs \
+    && chown -R 1001:0 /opt/ibm/logs \
+    && chmod -R g+rw /opt/ibm/logs \
+    && mkdir -p /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
+
+USER 1001
+RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
+USER root
+RUN ln -s /opt/ibm/links/logs /logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index 761294d0..f4be871d 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -112,8 +112,7 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /logs \
-    && mkdir /etc/wlp \
+RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -136,12 +135,24 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && mkdir -p /opt/ibm/links \
+    && chown -R 1001:0 /opt/ibm/links \
+    && chmod -R g+rw /opt/ibm/links \
+    && mkdir -p /opt/ibm/logs \
+    && chown -R 1001:0 /opt/ibm/logs \
+    && chmod -R g+rw /opt/ibm/logs \
+    && mkdir -p /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
+
+USER 1001
+RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
+USER root
+RUN ln -s /opt/ibm/links/logs /logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index ea5cb763..2ab46d0b 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -107,8 +107,7 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /logs \
-    && mkdir /etc/wlp \
+RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -131,12 +130,24 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && mkdir -p /opt/ibm/links \
+    && chown -R 1001:0 /opt/ibm/links \
+    && chmod -R g+rw /opt/ibm/links \
+    && mkdir -p /opt/ibm/logs \
+    && chown -R 1001:0 /opt/ibm/logs \
+    && chmod -R g+rw /opt/ibm/logs \
+    && mkdir -p /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
+
+USER 1001
+RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
+USER root
+RUN ln -s /opt/ibm/links/logs /logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index fc16031f..202e76cd 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -107,8 +107,7 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /logs \
-    && mkdir /etc/wlp \
+RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -131,12 +130,24 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && mkdir -p /opt/ibm/links \
+    && chown -R 1001:0 /opt/ibm/links \
+    && chmod -R g+rw /opt/ibm/links \
+    && mkdir -p /opt/ibm/logs \
+    && chown -R 1001:0 /opt/ibm/logs \
+    && chmod -R g+rw /opt/ibm/logs \
+    && mkdir -p /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
+
+USER 1001
+RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
+USER root
+RUN ln -s /opt/ibm/links/logs /logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/helpers/runtime/docker-server.sh b/ga/latest/kernel/helpers/runtime/docker-server.sh
index 8df65ef7..a6d92095 100755
--- a/ga/latest/kernel/helpers/runtime/docker-server.sh
+++ b/ga/latest/kernel/helpers/runtime/docker-server.sh
@@ -155,5 +155,11 @@ elif [[ ! -z "$WLP_CHECKPOINT" ]]; then
   checkpoint.sh "$TMP_CHECKPOINT"
 else
   # The default is to just exec the supplied CMD
+  if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+    SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME"
+    mkdir -p $SERVICEABILITY_FOLDER
+    rm -f /opt/ibm/links/logs
+    ln -s $SERVICEABILITY_FOLDER /opt/ibm/links/logs
+  fi
   exec "$@"
 fi

From 56f46b94d83df0a206068e53ba76b67cbc41b46d Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Fri, 11 Apr 2025 15:53:55 -0400
Subject: [PATCH 2/5] Point LOG_DIR to user 1001 managed symlink

---
 ga/latest/kernel/Dockerfile.ubi.ibmjava8      | 21 +++++--------------
 ga/latest/kernel/Dockerfile.ubi.openjdk11     | 21 +++++--------------
 ga/latest/kernel/Dockerfile.ubi.openjdk17     | 15 +++++--------
 ga/latest/kernel/Dockerfile.ubi.openjdk8      | 21 +++++--------------
 .../kernel/Dockerfile.ubi9-minimal.ibmjava8   |  6 ++++--
 .../kernel/Dockerfile.ubi9-minimal.openjdk11  |  6 ++++--
 .../kernel/Dockerfile.ubi9-minimal.openjdk17  |  6 ++++--
 .../kernel/Dockerfile.ubi9-minimal.openjdk21  | 13 +++---------
 .../kernel/Dockerfile.ubi9-minimal.openjdk8   |  6 ++++--
 ga/latest/kernel/Dockerfile.ubuntu.ibmjava8   | 13 +++---------
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11  | 18 +++-------------
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17  | 18 +++-------------
 .../kernel/helpers/runtime/docker-server.sh   |  6 +++---
 13 files changed, 51 insertions(+), 119 deletions(-)

diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index 3ac91577..f6aa68cc 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -117,7 +117,7 @@ COPY --from=getRuntime /licenses /licenses
 RUN yum -y install openssl \
     && yum clean all
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -131,7 +131,8 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /etc/wlp \
+RUN mkdir /logs \
+    && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -158,20 +159,8 @@ RUN mkdir /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
-    && mkdir -p /opt/ibm/links \
-    && chown -R 1001:0 /opt/ibm/links \
-    && chmod -R g+rw /opt/ibm/links \
-    && mkdir -p /opt/ibm/logs \
-    && chown -R 1001:0 /opt/ibm/logs \
-    && chmod -R g+rw /opt/ibm/logs \
-    && mkdir -p /serviceability \
-    && chown -R 1001:0 /serviceability \
-    && chmod -R g+rw /serviceability
-
-USER 1001
-RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
-USER root
-RUN ln -s /opt/ibm/links/logs /logs
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index ec2719a7..74818405 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -118,7 +118,7 @@ COPY --from=getRuntime /licenses /licenses
 RUN yum -y install openssl \
     && yum clean all
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -132,7 +132,8 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /etc/wlp \
+RUN mkdir /logs \
+    && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -160,20 +161,8 @@ RUN mkdir /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
-    && mkdir -p /opt/ibm/links \
-    && chown -R 1001:0 /opt/ibm/links \
-    && chmod -R g+rw /opt/ibm/links \
-    && mkdir -p /opt/ibm/logs \
-    && chown -R 1001:0 /opt/ibm/logs \
-    && chmod -R g+rw /opt/ibm/logs \
-    && mkdir -p /serviceability \
-    && chown -R 1001:0 /serviceability \
-    && chmod -R g+rw /serviceability
-
-USER 1001
-RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
-USER root
-RUN ln -s /opt/ibm/links/logs /logs
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index 4e9057ef..56f8e8fb 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -117,7 +117,7 @@ COPY --from=getRuntime /licenses /licenses
 RUN yum -y install openssl \
     && yum clean all
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -131,7 +131,8 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /etc/wlp \
+RUN mkdir /logs \
+    && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -165,14 +166,8 @@ RUN mkdir /etc/wlp \
     && mkdir -p /opt/ibm/logs \
     && chown -R 1001:0 /opt/ibm/logs \
     && chmod -R g+rw /opt/ibm/logs \
-    && mkdir -p /serviceability \
-    && chown -R 1001:0 /serviceability \
-    && chmod -R g+rw /serviceability
-
-USER 1001
-RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
-USER root
-RUN ln -s /opt/ibm/links/logs /logs
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index b12a5a50..920c0e5d 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -117,7 +117,7 @@ COPY --from=getRuntime /licenses /licenses
 RUN yum -y install openssl \
     && yum clean all
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -131,7 +131,8 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /etc/wlp \
+RUN mkdir /logs \
+    && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -159,20 +160,8 @@ RUN mkdir /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
-    && mkdir -p /opt/ibm/links \
-    && chown -R 1001:0 /opt/ibm/links \
-    && chmod -R g+rw /opt/ibm/links \
-    && mkdir -p /opt/ibm/logs \
-    && chown -R 1001:0 /opt/ibm/logs \
-    && chmod -R g+rw /opt/ibm/logs \
-    && mkdir -p /serviceability \
-    && chown -R 1001:0 /serviceability \
-    && chmod -R g+rw /serviceability
-
-USER 1001
-RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
-USER root
-RUN ln -s /opt/ibm/links/logs /logs
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
index 2426570b..b71dfdd0 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
@@ -131,7 +131,7 @@ COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -174,7 +174,9 @@ RUN mkdir /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
index 26511988..6dbeb72c 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
@@ -117,7 +117,7 @@ COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -161,7 +161,9 @@ RUN mkdir /logs \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
index f02644e1..3797c2d3 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
@@ -117,7 +117,7 @@ COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -161,7 +161,9 @@ RUN mkdir /logs \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
index 3c086a2d..605c7e1a 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
@@ -117,7 +117,7 @@ COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -159,15 +159,8 @@ RUN mkdir /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
-    && mkdir -p /opt/ibm/links \
-    && chown -R 1001:0 /opt/ibm/links \
-    && chmod -R g+rw /opt/ibm/links \
-    && mkdir -p /opt/ibm/logs \
-    && chown -R 1001:0 /opt/ibm/logs \
-    && chmod -R g+rw /opt/ibm/logs \
-    && mkdir -p /serviceability \
-    && chown -R 1001:0 /serviceability \
-    && chmod -R g+rw /serviceability
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 USER 1001
 RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
index 3beb43d2..8c4210b7 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
@@ -117,7 +117,7 @@ COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -161,7 +161,9 @@ RUN mkdir /logs \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index f4be871d..33094a67 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -98,7 +98,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -139,15 +139,8 @@ RUN mkdir /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
-    && mkdir -p /opt/ibm/links \
-    && chown -R 1001:0 /opt/ibm/links \
-    && chmod -R g+rw /opt/ibm/links \
-    && mkdir -p /opt/ibm/logs \
-    && chown -R 1001:0 /opt/ibm/logs \
-    && chmod -R g+rw /opt/ibm/logs \
-    && mkdir -p /serviceability \
-    && chown -R 1001:0 /serviceability \
-    && chmod -R g+rw /serviceability
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 USER 1001
 RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 2ab46d0b..9d564ef8 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -93,7 +93,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -134,20 +134,8 @@ RUN mkdir /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
-    && mkdir -p /opt/ibm/links \
-    && chown -R 1001:0 /opt/ibm/links \
-    && chmod -R g+rw /opt/ibm/links \
-    && mkdir -p /opt/ibm/logs \
-    && chown -R 1001:0 /opt/ibm/logs \
-    && chmod -R g+rw /opt/ibm/logs \
-    && mkdir -p /serviceability \
-    && chown -R 1001:0 /serviceability \
-    && chmod -R g+rw /serviceability
-
-USER 1001
-RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
-USER root
-RUN ln -s /opt/ibm/links/logs /logs
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 202e76cd..35213cb3 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -93,7 +93,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -134,20 +134,8 @@ RUN mkdir /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
-    && mkdir -p /opt/ibm/links \
-    && chown -R 1001:0 /opt/ibm/links \
-    && chmod -R g+rw /opt/ibm/links \
-    && mkdir -p /opt/ibm/logs \
-    && chown -R 1001:0 /opt/ibm/logs \
-    && chmod -R g+rw /opt/ibm/logs \
-    && mkdir -p /serviceability \
-    && chown -R 1001:0 /serviceability \
-    && chmod -R g+rw /serviceability
-
-USER 1001
-RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
-USER root
-RUN ln -s /opt/ibm/links/logs /logs
+    && ln -s /logs /liberty/logs \
+    && chown -h 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/helpers/runtime/docker-server.sh b/ga/latest/kernel/helpers/runtime/docker-server.sh
index a6d92095..ade1aed3 100755
--- a/ga/latest/kernel/helpers/runtime/docker-server.sh
+++ b/ga/latest/kernel/helpers/runtime/docker-server.sh
@@ -154,12 +154,12 @@ elif [[ ! -z "$WLP_CHECKPOINT" ]]; then
   # A checkpoint action has been requested; run the checkpoint.sh script.
   checkpoint.sh "$TMP_CHECKPOINT"
 else
-  # The default is to just exec the supplied CMD
   if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
     SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME"
     mkdir -p $SERVICEABILITY_FOLDER
-    rm -f /opt/ibm/links/logs
-    ln -s $SERVICEABILITY_FOLDER /opt/ibm/links/logs
+    rm /liberty/logs
+    ln -s $SERVICEABILITY_FOLDER /liberty/logs
   fi
+  # The default is to just exec the supplied CMD
   exec "$@"
 fi

From 345bd00be749190fe0a208085145050837a49e00 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Fri, 11 Apr 2025 15:56:06 -0400
Subject: [PATCH 3/5] Fix typos

---
 ga/latest/kernel/Dockerfile.ubi.openjdk17          | 6 ------
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 | 8 ++------
 ga/latest/kernel/Dockerfile.ubuntu.ibmjava8        | 8 ++------
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11       | 3 ++-
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17       | 3 ++-
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index 56f8e8fb..7d61bf55 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -160,12 +160,6 @@ RUN mkdir /logs \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
-    && mkdir -p /opt/ibm/links \
-    && chown -R 1001:0 /opt/ibm/links \
-    && chmod -R g+rw /opt/ibm/links \
-    && mkdir -p /opt/ibm/logs \
-    && chown -R 1001:0 /opt/ibm/logs \
-    && chmod -R g+rw /opt/ibm/logs \
     && ln -s /logs /liberty/logs \
     && chown -h 1001:0 /liberty/logs
 
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
index 605c7e1a..5d7f4d11 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
@@ -131,7 +131,8 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /etc/wlp \
+RUN mkdir /logs \
+    && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -162,11 +163,6 @@ RUN mkdir /etc/wlp \
     && ln -s /logs /liberty/logs \
     && chown -h 1001:0 /liberty/logs
 
-USER 1001
-RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
-USER root
-RUN ln -s /opt/ibm/links/logs /logs
-
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index 33094a67..d8e1c218 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -112,7 +112,8 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /etc/wlp \
+RUN mkdir /logs \
+    && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
@@ -142,11 +143,6 @@ RUN mkdir /etc/wlp \
     && ln -s /logs /liberty/logs \
     && chown -h 1001:0 /liberty/logs
 
-USER 1001
-RUN ln -s /opt/ibm/logs /opt/ibm/links/logs
-USER root
-RUN ln -s /opt/ibm/links/logs /logs
-
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 9d564ef8..9b23444d 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -107,7 +107,8 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /etc/wlp \
+RUN mkdir /logs \
+    && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 35213cb3..12d45640 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -107,7 +107,8 @@ COPY helpers/ /opt/ibm/helpers/
 COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
-RUN mkdir /etc/wlp \
+RUN mkdir /logs \
+    && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
     && mkdir /output \

From 82ca29f3d6bed7a5cadebc8d5f9a2990c40d64b3 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Fri, 25 Apr 2025 15:39:16 -0400
Subject: [PATCH 4/5] Add /serviceability folder and /liberty/logs symlink

---
 ga/latest/kernel/Dockerfile.ubi.ibmjava8           | 7 ++++++-
 ga/latest/kernel/Dockerfile.ubi.openjdk11          | 7 ++++++-
 ga/latest/kernel/Dockerfile.ubi.openjdk17          | 7 ++++++-
 ga/latest/kernel/Dockerfile.ubi.openjdk8           | 7 ++++++-
 ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8  | 9 ++++++---
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 | 9 ++++++---
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 | 9 ++++++---
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 | 7 ++++++-
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8  | 9 ++++++---
 ga/latest/kernel/Dockerfile.ubuntu.ibmjava8        | 7 ++++++-
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11       | 7 ++++++-
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17       | 7 ++++++-
 12 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index f6aa68cc..131b8582 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -132,6 +132,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -160,7 +162,10 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index 74818405..2a58e1f8 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -133,6 +133,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -162,7 +164,10 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index 7d61bf55..a3da0cab 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -132,6 +132,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -161,7 +163,10 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index 920c0e5d..f5457848 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -132,6 +132,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -161,7 +163,10 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
index b71dfdd0..009eb6e9 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
@@ -146,6 +146,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -169,14 +171,15 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
index 6dbeb72c..6895cb68 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
@@ -132,6 +132,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -155,15 +157,16 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
index 3797c2d3..bc568ca9 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
@@ -132,6 +132,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -155,15 +157,16 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
index 5d7f4d11..6d566b1b 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
@@ -132,6 +132,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -161,7 +163,10 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
index 8c4210b7..ddc14843 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
@@ -132,6 +132,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -155,15 +157,16 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index d8e1c218..e8f76e5d 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -113,6 +113,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -141,7 +143,10 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 9b23444d..e868db26 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -108,6 +108,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -136,7 +138,10 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 12d45640..e1438ed0 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -108,6 +108,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -136,7 +138,10 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown -h 1001:0 /liberty/logs
+    && chown 1001:0 /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

From a897a0c20d01dc3d8ba9bdf64733ef3cf3c040a7 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Fri, 25 Apr 2025 15:51:27 -0400
Subject: [PATCH 5/5] Remove symlink perm set

---
 ga/latest/kernel/Dockerfile.ubi.ibmjava8           | 1 -
 ga/latest/kernel/Dockerfile.ubi.openjdk11          | 1 -
 ga/latest/kernel/Dockerfile.ubi.openjdk17          | 1 -
 ga/latest/kernel/Dockerfile.ubi.openjdk8           | 1 -
 ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8  | 1 -
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 | 1 -
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 | 1 -
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 | 1 -
 ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8  | 1 -
 ga/latest/kernel/Dockerfile.ubuntu.ibmjava8        | 1 -
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11       | 1 -
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17       | 1 -
 12 files changed, 12 deletions(-)

diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index 131b8582..076e8857 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -162,7 +162,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index 2a58e1f8..4ffcd279 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -164,7 +164,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index a3da0cab..1465ca20 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -163,7 +163,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index f5457848..cf73b17b 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -163,7 +163,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
index 009eb6e9..298c27a2 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
@@ -176,7 +176,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
index 6895cb68..5a34a93b 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
@@ -163,7 +163,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
index bc568ca9..6ddc9de2 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
@@ -163,7 +163,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
index 6d566b1b..68a99fce 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
@@ -163,7 +163,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
index ddc14843..433d6525 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
@@ -163,7 +163,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index e8f76e5d..e87f546f 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -143,7 +143,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index e868db26..67b1ea10 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -138,7 +138,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index e1438ed0..4c8e5515 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -138,7 +138,6 @@ RUN mkdir /logs \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default \
     && ln -s /logs /liberty/logs \
-    && chown 1001:0 /liberty/logs \
     && mkdir /serviceability \
     && chown -R 1001:0 /serviceability \
     && chmod -R g+rw /serviceability