Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add runtime support for writing /logs to a /serviceability directory #664

Open
wants to merge 2 commits into
base: vNext
Choose a base branch
from
Open

Add runtime support for writing /logs to a /serviceability directory #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
134860d
Update kernel Dockerfiles for serviceability
leochr Feb 19, 2025
7bb0142
Revert changes from main
kabicin Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
21 changes: 16 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
21 changes: 16 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
21 changes: 16 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.openjdk21
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
21 changes: 16 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.openjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
21 changes: 16 additions & 5 deletions ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
21 changes: 16 additions & 5 deletions ga/latest/kernel/Dockerfile.ubuntu.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
21 changes: 16 additions & 5 deletions ga/latest/kernel/Dockerfile.ubuntu.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
6 changes: 6 additions & 0 deletions ga/latest/kernel/helpers/runtime/docker-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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