Skip to content

Commit 8ba45a9

Browse files
kabicinkabicin
committed
Update kernel-slim serviceability symlink
1 parent 799950b commit 8ba45a9

7 files changed

+106
-35
lines changed

‎releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8

+16-5
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create \
107107
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
108108

109109
# Create symlinks && set permissions for non-root user
110-
RUN mkdir /logs \
111-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
110+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
112111
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
113112
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114113
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -119,8 +118,6 @@ RUN mkdir /logs \
119118
&& ln -s /opt/ol/fixes /fixes \
120119
&& chown -R 1001:0 /config \
121120
&& chmod -R g+rw /config \
122-
&& chown -R 1001:0 /logs \
123-
&& chmod -R g+rw /logs \
124121
&& chown -R 1001:0 /opt/ol/wlp/usr \
125122
&& chmod -R g+rw /opt/ol/wlp/usr \
126123
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -132,7 +129,21 @@ RUN mkdir /logs \
132129
&& mkdir /etc/wlp \
133130
&& chown -R 1001:0 /etc/wlp \
134131
&& chmod -R g+rw /etc/wlp \
135-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
132+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
133+
&& mkdir -p /opt/ol/links \
134+
&& chown -R 1001:0 /opt/ol/links \
135+
&& chmod -R g+rw /opt/ol/links \
136+
&& mkdir -p /opt/ol/logs \
137+
&& chown -R 1001:0 /opt/ol/logs \
138+
&& chmod -R g+rw /opt/ol/logs \
139+
&& mkdir -p /serviceability \
140+
&& chown -R 1001:0 /serviceability \
141+
&& chmod -R g+rw /serviceability
142+
143+
USER 1001
144+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
145+
USER root
146+
RUN ln -s /opt/ol/links/logs /logs
136147

137148
# Create a new SCC layer
138149
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

‎releases/latest/kernel-slim/Dockerfile.ubi.openjdk11

+16-6
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create \
107107
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
108108

109109
# Create symlinks && set permissions for non-root user
110-
RUN mkdir /logs \
111-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
110+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
112111
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
113112
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114113
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -119,8 +118,6 @@ RUN mkdir /logs \
119118
&& ln -s /opt/ol/fixes /fixes \
120119
&& chown -R 1001:0 /config \
121120
&& chmod -R g+rw /config \
122-
&& chown -R 1001:0 /logs \
123-
&& chmod -R g+rw /logs \
124121
&& chown -R 1001:0 /opt/ol/wlp/usr \
125122
&& chmod -R g+rw /opt/ol/wlp/usr \
126123
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -132,8 +129,21 @@ RUN mkdir /logs \
132129
&& mkdir /etc/wlp \
133130
&& chown -R 1001:0 /etc/wlp \
134131
&& chmod -R g+rw /etc/wlp \
135-
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
136-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
132+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
133+
&& mkdir -p /opt/ol/links \
134+
&& chown -R 1001:0 /opt/ol/links \
135+
&& chmod -R g+rw /opt/ol/links \
136+
&& mkdir -p /opt/ol/logs \
137+
&& chown -R 1001:0 /opt/ol/logs \
138+
&& chmod -R g+rw /opt/ol/logs \
139+
&& mkdir -p /serviceability \
140+
&& chown -R 1001:0 /serviceability \
141+
&& chmod -R g+rw /serviceability
142+
143+
USER 1001
144+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
145+
USER root
146+
RUN ln -s /opt/ol/links/logs /logs
137147

138148
# Create a new SCC layer
139149
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

‎releases/latest/kernel-slim/Dockerfile.ubi.openjdk17

+16-6
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create \
107107
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
108108

109109
# Create symlinks && set permissions for non-root user
110-
RUN mkdir /logs \
111-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
110+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
112111
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
113112
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114113
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -119,8 +118,6 @@ RUN mkdir /logs \
119118
&& ln -s /opt/ol/fixes /fixes \
120119
&& chown -R 1001:0 /config \
121120
&& chmod -R g+rw /config \
122-
&& chown -R 1001:0 /logs \
123-
&& chmod -R g+rw /logs \
124121
&& chown -R 1001:0 /opt/ol/wlp/usr \
125122
&& chmod -R g+rw /opt/ol/wlp/usr \
126123
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -132,8 +129,21 @@ RUN mkdir /logs \
132129
&& mkdir /etc/wlp \
133130
&& chown -R 1001:0 /etc/wlp \
134131
&& chmod -R g+rw /etc/wlp \
135-
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
136-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
132+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
133+
&& mkdir -p /opt/ol/links \
134+
&& chown -R 1001:0 /opt/ol/links \
135+
&& chmod -R g+rw /opt/ol/links \
136+
&& mkdir -p /opt/ol/logs \
137+
&& chown -R 1001:0 /opt/ol/logs \
138+
&& chmod -R g+rw /opt/ol/logs \
139+
&& mkdir -p /serviceability \
140+
&& chown -R 1001:0 /serviceability \
141+
&& chmod -R g+rw /serviceability
142+
143+
USER 1001
144+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
145+
USER root
146+
RUN ln -s /opt/ol/links/logs /logs
137147

138148
# Create a new SCC layer
139149
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

‎releases/latest/kernel-slim/Dockerfile.ubi.openjdk21

+16-5
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ RUN /opt/ol/wlp/bin/server create \
108108
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
109109

110110
# Create symlinks && set permissions for non-root user
111-
RUN mkdir /logs \
112-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
111+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
113112
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
114113
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
115114
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -121,8 +120,6 @@ RUN mkdir /logs \
121120
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
122121
&& chown -R 1001:0 /config \
123122
&& chmod -R g+rw /config \
124-
&& chown -R 1001:0 /logs \
125-
&& chmod -R g+rw /logs \
126123
&& chown -R 1001:0 /opt/ol/wlp/usr \
127124
&& chmod -R g+rw /opt/ol/wlp/usr \
128125
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -134,7 +131,21 @@ RUN mkdir /logs \
134131
&& mkdir /etc/wlp \
135132
&& chown -R 1001:0 /etc/wlp \
136133
&& chmod -R g+rw /etc/wlp \
137-
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi
134+
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
135+
&& mkdir -p /opt/ol/links \
136+
&& chown -R 1001:0 /opt/ol/links \
137+
&& chmod -R g+rw /opt/ol/links \
138+
&& mkdir -p /opt/ol/logs \
139+
&& chown -R 1001:0 /opt/ol/logs \
140+
&& chmod -R g+rw /opt/ol/logs \
141+
&& mkdir -p /serviceability \
142+
&& chown -R 1001:0 /serviceability \
143+
&& chmod -R g+rw /serviceability
144+
145+
USER 1001
146+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
147+
USER root
148+
RUN ln -s /opt/ol/links/logs /logs
138149

139150
# Create a new SCC layer
140151
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

‎releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11

+16-3
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create \
8585
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
8686

8787
# Create symlinks && set permissions for non-root user
88-
RUN mkdir /logs \
89-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
88+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
9089
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
9190
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
9291
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -110,7 +109,21 @@ RUN mkdir /logs \
110109
&& mkdir /etc/wlp \
111110
&& chown -R 1001:0 /etc/wlp \
112111
&& chmod -R g+rw /etc/wlp \
113-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
112+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
113+
&& mkdir -p /opt/ol/links \
114+
&& chown -R 1001:0 /opt/ol/links \
115+
&& chmod -R g+rw /opt/ol/links \
116+
&& mkdir -p /opt/ol/logs \
117+
&& chown -R 1001:0 /opt/ol/logs \
118+
&& chmod -R g+rw /opt/ol/logs \
119+
&& mkdir -p /serviceability \
120+
&& chown -R 1001:0 /serviceability \
121+
&& chmod -R g+rw /serviceability
122+
123+
USER 1001
124+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
125+
USER root
126+
RUN ln -s /opt/ol/links/logs /logs
114127

115128
# Create a new SCC layer
116129
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

‎releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17

+16-3
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create \
8585
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
8686

8787
# Create symlinks && set permissions for non-root user
88-
RUN mkdir /logs \
89-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
88+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
9089
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
9190
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
9291
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -110,7 +109,21 @@ RUN mkdir /logs \
110109
&& mkdir /etc/wlp \
111110
&& chown -R 1001:0 /etc/wlp \
112111
&& chmod -R g+rw /etc/wlp \
113-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
112+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
113+
&& mkdir -p /opt/ol/links \
114+
&& chown -R 1001:0 /opt/ol/links \
115+
&& chmod -R g+rw /opt/ol/links \
116+
&& mkdir -p /opt/ol/logs \
117+
&& chown -R 1001:0 /opt/ol/logs \
118+
&& chmod -R g+rw /opt/ol/logs \
119+
&& mkdir -p /serviceability \
120+
&& chown -R 1001:0 /serviceability \
121+
&& chmod -R g+rw /serviceability
122+
123+
USER 1001
124+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
125+
USER root
126+
RUN ln -s /opt/ol/links/logs /logs
114127

115128
# Create a new SCC layer
116129
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

‎releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8

+10-7
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ RUN /opt/ol/wlp/bin/server create \
8585
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
8686

8787
# Create symlinks && set permissions for non-root user
88-
RUN mkdir /logs \
89-
&& mkdir -p /serviceability/logs \
90-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
88+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
9189
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
9290
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
9391
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -114,13 +112,18 @@ RUN mkdir /logs \
114112
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
115113
&& mkdir -p /opt/ol/links \
116114
&& chown -R 1001:0 /opt/ol/links \
117-
&& chmod -R g+rw /opt/ol/links
115+
&& chmod -R g+rw /opt/ol/links \
116+
&& mkdir -p /opt/ol/logs \
117+
&& chown -R 1001:0 /opt/ol/logs \
118+
&& chmod -R g+rw /opt/ol/logs \
119+
&& mkdir -p /serviceability \
120+
&& chown -R 1001:0 /serviceability \
121+
&& chmod -R g+rw /serviceability
118122

119123
USER 1001
120-
RUN ln -s /serviceability/logs /opt/ol/links/logs
124+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
121125
USER root
122-
RUN ln -s /opt/ol/links/logs /logs \
123-
&& chown -R 1001:0 /opt/ol/links/logs
126+
RUN ln -s /opt/ol/links/logs /logs
124127

125128
# Create a new SCC layer
126129
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

0 commit comments

Comments
 (0)