Skip to content

Commit c17d226

Browse files
kabicinkabicin
committed
Add missing updates to rebased files
1 parent 54f59b7 commit c17d226

28 files changed

Lines changed: 757 additions & 55 deletions

‎releases/22.0.0.12/full/Dockerfile.ubi.ibmjava8‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,41 @@ RUN mkdir /logs \
8080
&& mkdir /etc/wlp \
8181
&& chown -R 1001:0 /etc/wlp \
8282
&& chmod -R g+rw /etc/wlp \
83-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
83+
&& mkdir -p /opt/ol/links \
84+
&& chown -R 1001:0 /opt/ol/links \
85+
&& chmod -R g+rw /opt/ol/links
86+
87+
# Create second-level symlinks as non-root user
88+
USER 1001
89+
90+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
91+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
92+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
93+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
94+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
95+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
96+
97+
# Create first-level symlinks as root user
98+
USER 0
99+
100+
RUN ln -s /opt/ol/links/output /output \
101+
&& ln -s /opt/ol/links/config /config \
102+
&& chown -R 1001:0 /opt/ol/links/output \
103+
&& chmod -R g+rw /opt/ol/links/output \
104+
&& chown -R 1001:0 /opt/ol/links/config \
105+
&& chmod -R g+rw /opt/ol/links/config \
106+
&& chown -R 1001:0 /config \
107+
&& chmod -R g+rw /config \
108+
&& chown -R 1001:0 /output \
109+
&& chmod -R g+rw /output
84110

85111
# Create a new SCC layer
86112
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
87113
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
88114
&& chown -R 1001:0 /opt/ol/wlp/output \
89115
&& chmod -R g+rwx /opt/ol/wlp/output
90116

91-
#These settings are needed so that we can run as a different user than 1001 after server warmup
117+
# These settings are needed so that we can run as a different user than 1001 after server warmup
92118
ENV RANDFILE=/tmp/.rnd \
93119
IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}"
94120

‎releases/22.0.0.12/full/Dockerfile.ubi.openjdk11‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,41 @@ RUN mkdir /logs \
8080
&& mkdir /etc/wlp \
8181
&& chown -R 1001:0 /etc/wlp \
8282
&& chmod -R g+rw /etc/wlp \
83-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
83+
&& mkdir -p /opt/ol/links \
84+
&& chown -R 1001:0 /opt/ol/links \
85+
&& chmod -R g+rw /opt/ol/links
86+
87+
# Create second-level symlinks as non-root user
88+
USER 1001
89+
90+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
91+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
92+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
93+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
94+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
95+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
96+
97+
# Create first-level symlinks as root user
98+
USER 0
99+
100+
RUN ln -s /opt/ol/links/output /output \
101+
&& ln -s /opt/ol/links/config /config \
102+
&& chown -R 1001:0 /opt/ol/links/output \
103+
&& chmod -R g+rw /opt/ol/links/output \
104+
&& chown -R 1001:0 /opt/ol/links/config \
105+
&& chmod -R g+rw /opt/ol/links/config \
106+
&& chown -R 1001:0 /config \
107+
&& chmod -R g+rw /config \
108+
&& chown -R 1001:0 /output \
109+
&& chmod -R g+rw /output
84110

85111
# Create a new SCC layer
86112
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
87113
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
88114
&& chown -R 1001:0 /opt/ol/wlp/output \
89115
&& chmod -R g+rwx /opt/ol/wlp/output
90116

91-
#These settings are needed so that we can run as a different user than 1001 after server warmup
117+
# These settings are needed so that we can run as a different user than 1001 after server warmup
92118
ENV RANDFILE=/tmp/.rnd \
93119
OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false"
94120

‎releases/22.0.0.12/full/Dockerfile.ubi.openjdk17‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,41 @@ RUN mkdir /logs \
8080
&& mkdir /etc/wlp \
8181
&& chown -R 1001:0 /etc/wlp \
8282
&& chmod -R g+rw /etc/wlp \
83-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
83+
&& mkdir -p /opt/ol/links \
84+
&& chown -R 1001:0 /opt/ol/links \
85+
&& chmod -R g+rw /opt/ol/links
86+
87+
# Create second-level symlinks as non-root user
88+
USER 1001
89+
90+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
91+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
92+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
93+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
94+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
95+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
96+
97+
# Create first-level symlinks as root user
98+
USER 0
99+
100+
RUN ln -s /opt/ol/links/output /output \
101+
&& ln -s /opt/ol/links/config /config \
102+
&& chown -R 1001:0 /opt/ol/links/output \
103+
&& chmod -R g+rw /opt/ol/links/output \
104+
&& chown -R 1001:0 /opt/ol/links/config \
105+
&& chmod -R g+rw /opt/ol/links/config \
106+
&& chown -R 1001:0 /config \
107+
&& chmod -R g+rw /config \
108+
&& chown -R 1001:0 /output \
109+
&& chmod -R g+rw /output
84110

85111
# Create a new SCC layer
86112
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
87113
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
88114
&& chown -R 1001:0 /opt/ol/wlp/output \
89115
&& chmod -R g+rwx /opt/ol/wlp/output
90116

91-
#These settings are needed so that we can run as a different user than 1001 after server warmup
117+
# These settings are needed so that we can run as a different user than 1001 after server warmup
92118
ENV RANDFILE=/tmp/.rnd \
93119
OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false"
94120

‎releases/22.0.0.12/full/Dockerfile.ubi.openjdk8‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,41 @@ RUN mkdir /logs \
8080
&& mkdir /etc/wlp \
8181
&& chown -R 1001:0 /etc/wlp \
8282
&& chmod -R g+rw /etc/wlp \
83-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
83+
&& mkdir -p /opt/ol/links \
84+
&& chown -R 1001:0 /opt/ol/links \
85+
&& chmod -R g+rw /opt/ol/links
86+
87+
# Create second-level symlinks as non-root user
88+
USER 1001
89+
90+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
91+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
92+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
93+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
94+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
95+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
96+
97+
# Create first-level symlinks as root user
98+
USER 0
99+
100+
RUN ln -s /opt/ol/links/output /output \
101+
&& ln -s /opt/ol/links/config /config \
102+
&& chown -R 1001:0 /opt/ol/links/output \
103+
&& chmod -R g+rw /opt/ol/links/output \
104+
&& chown -R 1001:0 /opt/ol/links/config \
105+
&& chmod -R g+rw /opt/ol/links/config \
106+
&& chown -R 1001:0 /config \
107+
&& chmod -R g+rw /config \
108+
&& chown -R 1001:0 /output \
109+
&& chmod -R g+rw /output
84110

85111
# Create a new SCC layer
86112
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
87113
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
88114
&& chown -R 1001:0 /opt/ol/wlp/output \
89115
&& chmod -R g+rwx /opt/ol/wlp/output
90116

91-
#These settings are needed so that we can run as a different user than 1001 after server warmup
117+
# These settings are needed so that we can run as a different user than 1001 after server warmup
92118
ENV RANDFILE=/tmp/.rnd \
93119
OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false"
94120

‎releases/22.0.0.12/full/Dockerfile.ubuntu.openjdk11‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,41 @@ RUN mkdir /logs \
7979
&& mkdir /etc/wlp \
8080
&& chown -R 1001:0 /etc/wlp \
8181
&& chmod -R g+rw /etc/wlp \
82-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
82+
&& mkdir -p /opt/ol/links \
83+
&& chown -R 1001:0 /opt/ol/links \
84+
&& chmod -R g+rw /opt/ol/links
85+
86+
# Create second-level symlinks as non-root user
87+
USER 1001
88+
89+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
90+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
91+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
92+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
93+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
94+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
95+
96+
# Create first-level symlinks as root user
97+
USER 0
98+
99+
RUN ln -s /opt/ol/links/output /output \
100+
&& ln -s /opt/ol/links/config /config \
101+
&& chown -R 1001:0 /opt/ol/links/output \
102+
&& chmod -R g+rw /opt/ol/links/output \
103+
&& chown -R 1001:0 /opt/ol/links/config \
104+
&& chmod -R g+rw /opt/ol/links/config \
105+
&& chown -R 1001:0 /config \
106+
&& chmod -R g+rw /config \
107+
&& chown -R 1001:0 /output \
108+
&& chmod -R g+rw /output
83109

84110
# Create a new SCC layer
85111
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
86112
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
87113
&& chown -R 1001:0 /opt/ol/wlp/output \
88114
&& chmod -R g+rwx /opt/ol/wlp/output
89115

90-
#These settings are needed so that we can run as a different user than 1001 after server warmup
116+
# These settings are needed so that we can run as a different user than 1001 after server warmup
91117
ENV RANDFILE=/tmp/.rnd \
92118
OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false"
93119

‎releases/22.0.0.12/full/Dockerfile.ubuntu.openjdk17‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,41 @@ RUN mkdir /logs \
7979
&& mkdir /etc/wlp \
8080
&& chown -R 1001:0 /etc/wlp \
8181
&& chmod -R g+rw /etc/wlp \
82-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
82+
&& mkdir -p /opt/ol/links \
83+
&& chown -R 1001:0 /opt/ol/links \
84+
&& chmod -R g+rw /opt/ol/links
85+
86+
# Create second-level symlinks as non-root user
87+
USER 1001
88+
89+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
90+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
91+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
92+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
93+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
94+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
95+
96+
# Create first-level symlinks as root user
97+
USER 0
98+
99+
RUN ln -s /opt/ol/links/output /output \
100+
&& ln -s /opt/ol/links/config /config \
101+
&& chown -R 1001:0 /opt/ol/links/output \
102+
&& chmod -R g+rw /opt/ol/links/output \
103+
&& chown -R 1001:0 /opt/ol/links/config \
104+
&& chmod -R g+rw /opt/ol/links/config \
105+
&& chown -R 1001:0 /config \
106+
&& chmod -R g+rw /config \
107+
&& chown -R 1001:0 /output \
108+
&& chmod -R g+rw /output
83109

84110
# Create a new SCC layer
85111
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
86112
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
87113
&& chown -R 1001:0 /opt/ol/wlp/output \
88114
&& chmod -R g+rwx /opt/ol/wlp/output
89115

90-
#These settings are needed so that we can run as a different user than 1001 after server warmup
116+
# These settings are needed so that we can run as a different user than 1001 after server warmup
91117
ENV RANDFILE=/tmp/.rnd \
92118
OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false"
93119

‎releases/22.0.0.12/full/Dockerfile.ubuntu.openjdk8‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,41 @@ RUN mkdir /logs \
7979
&& mkdir /etc/wlp \
8080
&& chown -R 1001:0 /etc/wlp \
8181
&& chmod -R g+rw /etc/wlp \
82-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
82+
&& mkdir -p /opt/ol/links \
83+
&& chown -R 1001:0 /opt/ol/links \
84+
&& chmod -R g+rw /opt/ol/links
85+
86+
# Create second-level symlinks as non-root user
87+
USER 1001
88+
89+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
90+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
91+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
92+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
93+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
94+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
95+
96+
# Create first-level symlinks as root user
97+
USER 0
98+
99+
RUN ln -s /opt/ol/links/output /output \
100+
&& ln -s /opt/ol/links/config /config \
101+
&& chown -R 1001:0 /opt/ol/links/output \
102+
&& chmod -R g+rw /opt/ol/links/output \
103+
&& chown -R 1001:0 /opt/ol/links/config \
104+
&& chmod -R g+rw /opt/ol/links/config \
105+
&& chown -R 1001:0 /config \
106+
&& chmod -R g+rw /config \
107+
&& chown -R 1001:0 /output \
108+
&& chmod -R g+rw /output
83109

84110
# Create a new SCC layer
85111
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
86112
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
87113
&& chown -R 1001:0 /opt/ol/wlp/output \
88114
&& chmod -R g+rwx /opt/ol/wlp/output
89115

90-
#These settings are needed so that we can run as a different user than 1001 after server warmup
116+
# These settings are needed so that we can run as a different user than 1001 after server warmup
91117
ENV RANDFILE=/tmp/.rnd \
92118
OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false"
93119

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

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,41 @@ RUN mkdir /logs \
7878
&& mkdir /etc/wlp \
7979
&& chown -R 1001:0 /etc/wlp \
8080
&& chmod -R g+rw /etc/wlp \
81-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
81+
&& mkdir -p /opt/ol/links \
82+
&& chown -R 1001:0 /opt/ol/links \
83+
&& chmod -R g+rw /opt/ol/links
84+
85+
# Create second-level symlinks as non-root user
86+
USER 1001
87+
88+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
89+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
90+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
91+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
92+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
93+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
94+
95+
# Create first-level symlinks as root user
96+
USER 0
97+
98+
RUN ln -s /opt/ol/links/output /output \
99+
&& ln -s /opt/ol/links/config /config \
100+
&& chown -R 1001:0 /opt/ol/links/output \
101+
&& chmod -R g+rw /opt/ol/links/output \
102+
&& chown -R 1001:0 /opt/ol/links/config \
103+
&& chmod -R g+rw /opt/ol/links/config \
104+
&& chown -R 1001:0 /config \
105+
&& chmod -R g+rw /config \
106+
&& chown -R 1001:0 /output \
107+
&& chmod -R g+rw /output
82108

83109
# Create a new SCC layer
84110
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
85111
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea \
86112
&& chown -R 1001:0 /opt/ol/wlp/output \
87113
&& chmod -R g+rwx /opt/ol/wlp/output
88114

89-
#These settings are needed so that we can run as a different user than 1001 after server warmup
115+
# These settings are needed so that we can run as a different user than 1001 after server warmup
90116
ENV RANDFILE=/tmp/.rnd \
91117
IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}"
92118

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

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,41 @@ RUN mkdir /logs \
7878
&& mkdir /etc/wlp \
7979
&& chown -R 1001:0 /etc/wlp \
8080
&& chmod -R g+rw /etc/wlp \
81-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
81+
&& mkdir -p /opt/ol/links \
82+
&& chown -R 1001:0 /opt/ol/links \
83+
&& chmod -R g+rw /opt/ol/links
84+
85+
# Create second-level symlinks as non-root user
86+
USER 1001
87+
88+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
89+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ol/links/output \
90+
&& ln -s /opt/ol/wlp/usr/servers/defaultServer /opt/ol/links/config \
91+
&& mkdir -p /opt/ol/links/config/configDropins/defaults \
92+
&& mkdir -p /opt/ol/links/config/configDropins/overrides \
93+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /opt/ol/links/config/configDropins/defaults/open-default-port.xml
94+
95+
# Create first-level symlinks as root user
96+
USER 0
97+
98+
RUN ln -s /opt/ol/links/output /output \
99+
&& ln -s /opt/ol/links/config /config \
100+
&& chown -R 1001:0 /opt/ol/links/output \
101+
&& chmod -R g+rw /opt/ol/links/output \
102+
&& chown -R 1001:0 /opt/ol/links/config \
103+
&& chmod -R g+rw /opt/ol/links/config \
104+
&& chown -R 1001:0 /config \
105+
&& chmod -R g+rw /config \
106+
&& chown -R 1001:0 /output \
107+
&& chmod -R g+rw /output
82108

83109
# Create a new SCC layer
84110
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
85111
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea \
86112
&& chown -R 1001:0 /opt/ol/wlp/output \
87113
&& chmod -R g+rwx /opt/ol/wlp/output
88114

89-
#These settings are needed so that we can run as a different user than 1001 after server warmup
115+
# These settings are needed so that we can run as a different user than 1001 after server warmup
90116
ENV RANDFILE=/tmp/.rnd \
91117
OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false"
92118

0 commit comments

Comments
 (0)