Skip to content

Commit 2463b88

Browse files
kabicinkabicin
committed
Update full and beta Dockerfiles
1 parent 92be698 commit 2463b88

13 files changed

+188
-55
lines changed

Diff for: ‎releases/latest/beta/Dockerfile.ubi.openjdk21

+16-5
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -122,8 +121,6 @@ RUN mkdir /logs \
122121
&& ln -s /opt/ol/fixes /fixes \
123122
&& chown -R 1001:0 /config \
124123
&& chmod -R g+rw /config \
125-
&& chown -R 1001:0 /logs \
126-
&& chmod -R g+rw /logs \
127124
&& chown -R 1001:0 /opt/ol/wlp/usr \
128125
&& chmod -R g+rw /opt/ol/wlp/usr \
129126
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -136,7 +133,21 @@ RUN mkdir /logs \
136133
&& chown -R 1001:0 /etc/wlp \
137134
&& chmod -R g+rw /etc/wlp \
138135
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
139-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
136+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
137+
&& mkdir -p /opt/ol/links \
138+
&& chown -R 1001:0 /opt/ol/links \
139+
&& chmod -R g+rw /opt/ol/links \
140+
&& mkdir -p /opt/ol/logs \
141+
&& chown -R 1001:0 /opt/ol/logs \
142+
&& chmod -R g+rw /opt/ol/logs \
143+
&& mkdir -p /serviceability \
144+
&& chown -R 1001:0 /serviceability \
145+
&& chmod -R g+rw /serviceability
146+
147+
USER 1001
148+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
149+
USER root
150+
RUN ln -s /opt/ol/links/logs /logs
140151

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

Diff for: ‎releases/latest/beta/Dockerfile.ubuntu.openjdk11

+16-5
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -99,8 +98,6 @@ RUN mkdir /logs \
9998
&& ln -s /opt/ol/fixes /fixes \
10099
&& chown -R 1001:0 /config \
101100
&& chmod -R g+rw /config \
102-
&& chown -R 1001:0 /logs \
103-
&& chmod -R g+rw /logs \
104101
&& chown -R 1001:0 /opt/ol/wlp/usr \
105102
&& chmod -R g+rw /opt/ol/wlp/usr \
106103
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +109,21 @@ RUN mkdir /logs \
112109
&& mkdir /etc/wlp \
113110
&& chown -R 1001:0 /etc/wlp \
114111
&& chmod -R g+rw /etc/wlp \
115-
&& 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
116127

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

Diff for: ‎releases/latest/beta/Dockerfile.ubuntu.openjdk17

+16-5
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -99,8 +98,6 @@ RUN mkdir /logs \
9998
&& ln -s /opt/ol/fixes /fixes \
10099
&& chown -R 1001:0 /config \
101100
&& chmod -R g+rw /config \
102-
&& chown -R 1001:0 /logs \
103-
&& chmod -R g+rw /logs \
104101
&& chown -R 1001:0 /opt/ol/wlp/usr \
105102
&& chmod -R g+rw /opt/ol/wlp/usr \
106103
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +109,21 @@ RUN mkdir /logs \
112109
&& mkdir /etc/wlp \
113110
&& chown -R 1001:0 /etc/wlp \
114111
&& chmod -R g+rw /etc/wlp \
115-
&& 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
116127

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

Diff for: ‎releases/latest/beta/Dockerfile.ubuntu.openjdk8

+16-5
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -99,8 +98,6 @@ RUN mkdir /logs \
9998
&& ln -s /opt/ol/fixes /fixes \
10099
&& chown -R 1001:0 /config \
101100
&& chmod -R g+rw /config \
102-
&& chown -R 1001:0 /logs \
103-
&& chmod -R g+rw /logs \
104101
&& chown -R 1001:0 /opt/ol/wlp/usr \
105102
&& chmod -R g+rw /opt/ol/wlp/usr \
106103
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +109,21 @@ RUN mkdir /logs \
112109
&& mkdir /etc/wlp \
113110
&& chown -R 1001:0 /etc/wlp \
114111
&& chmod -R g+rw /etc/wlp \
115-
&& 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
116127

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

Diff for: ‎releases/latest/beta/helpers/runtime/docker-server.sh

+6
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,11 @@ elif [[ ! -z "$WLP_CHECKPOINT" ]]; then
141141
checkpoint.sh "$TMP_CHECKPOINT"
142142
else
143143
# The default is to just exec the supplied CMD
144+
if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
145+
SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME"
146+
mkdir -p $SERVICEABILITY_FOLDER
147+
rm -f /opt/ol/links/logs
148+
ln -s $SERVICEABILITY_FOLDER /opt/ol/links/logs
149+
fi
144150
exec "$@"
145151
fi

Diff for: ‎releases/latest/full/Dockerfile.ubi.ibmjava8

+16-5
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -121,8 +120,6 @@ RUN mkdir /logs \
121120
&& ln -s /opt/ol/fixes /fixes \
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-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
134+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
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 \

Diff for: ‎releases/latest/full/Dockerfile.ubi.openjdk11

+16-5
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -121,8 +120,6 @@ RUN mkdir /logs \
121120
&& ln -s /opt/ol/fixes /fixes \
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 \
@@ -135,7 +132,21 @@ RUN mkdir /logs \
135132
&& chown -R 1001:0 /etc/wlp \
136133
&& chmod -R g+rw /etc/wlp \
137134
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
138-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
135+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
136+
&& mkdir -p /opt/ol/links \
137+
&& chown -R 1001:0 /opt/ol/links \
138+
&& chmod -R g+rw /opt/ol/links \
139+
&& mkdir -p /opt/ol/logs \
140+
&& chown -R 1001:0 /opt/ol/logs \
141+
&& chmod -R g+rw /opt/ol/logs \
142+
&& mkdir -p /serviceability \
143+
&& chown -R 1001:0 /serviceability \
144+
&& chmod -R g+rw /serviceability
145+
146+
USER 1001
147+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
148+
USER root
149+
RUN ln -s /opt/ol/links/logs /logs
139150

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

Diff for: ‎releases/latest/full/Dockerfile.ubi.openjdk17

+16-5
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -121,8 +120,6 @@ RUN mkdir /logs \
121120
&& ln -s /opt/ol/fixes /fixes \
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 \
@@ -135,7 +132,21 @@ RUN mkdir /logs \
135132
&& chown -R 1001:0 /etc/wlp \
136133
&& chmod -R g+rw /etc/wlp \
137134
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
138-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
135+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
136+
&& mkdir -p /opt/ol/links \
137+
&& chown -R 1001:0 /opt/ol/links \
138+
&& chmod -R g+rw /opt/ol/links \
139+
&& mkdir -p /opt/ol/logs \
140+
&& chown -R 1001:0 /opt/ol/logs \
141+
&& chmod -R g+rw /opt/ol/logs \
142+
&& mkdir -p /serviceability \
143+
&& chown -R 1001:0 /serviceability \
144+
&& chmod -R g+rw /serviceability
145+
146+
USER 1001
147+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
148+
USER root
149+
RUN ln -s /opt/ol/links/logs /logs
139150

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

Diff for: ‎releases/latest/full/Dockerfile.ubi.openjdk8

+16-5
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -121,8 +120,6 @@ RUN mkdir /logs \
121120
&& ln -s /opt/ol/fixes /fixes \
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 \
@@ -135,7 +132,21 @@ RUN mkdir /logs \
135132
&& chown -R 1001:0 /etc/wlp \
136133
&& chmod -R g+rw /etc/wlp \
137134
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
138-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
135+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
136+
&& mkdir -p /opt/ol/links \
137+
&& chown -R 1001:0 /opt/ol/links \
138+
&& chmod -R g+rw /opt/ol/links \
139+
&& mkdir -p /opt/ol/logs \
140+
&& chown -R 1001:0 /opt/ol/logs \
141+
&& chmod -R g+rw /opt/ol/logs \
142+
&& mkdir -p /serviceability \
143+
&& chown -R 1001:0 /serviceability \
144+
&& chmod -R g+rw /serviceability
145+
146+
USER 1001
147+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
148+
USER root
149+
RUN ln -s /opt/ol/links/logs /logs
139150

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

Diff for: ‎releases/latest/full/Dockerfile.ubuntu.openjdk11

+16-5
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
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 \
@@ -99,8 +98,6 @@ RUN mkdir /logs \
9998
&& ln -s /opt/ol/fixes /fixes \
10099
&& chown -R 1001:0 /config \
101100
&& chmod -R g+rw /config \
102-
&& chown -R 1001:0 /logs \
103-
&& chmod -R g+rw /logs \
104101
&& chown -R 1001:0 /opt/ol/wlp/usr \
105102
&& chmod -R g+rw /opt/ol/wlp/usr \
106103
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +109,21 @@ RUN mkdir /logs \
112109
&& mkdir /etc/wlp \
113110
&& chown -R 1001:0 /etc/wlp \
114111
&& chmod -R g+rw /etc/wlp \
115-
&& 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
116127

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

0 commit comments

Comments
 (0)