Skip to content

Commit e5de794

Browse files
kabicinkabicin
kabicin
authored and
kabicin
committed
Add defaultServer name change feature
1 parent 57242a8 commit e5de794

7 files changed

Lines changed: 217 additions & 91 deletions

‎ga/latest/kernel/Dockerfile.ubi.ibmjava8‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,32 +130,50 @@ RUN mkdir /logs \
130130
&& mkdir /etc/wlp \
131131
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
132132
&& mkdir -p /home/default \
133-
&& mkdir /output \
134-
&& chmod -t /output \
135-
&& rm -rf /output \
136-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
137-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
138133
&& ln -s /opt/ibm /liberty \
139134
&& ln -s /opt/ibm/fixes /fixes \
140135
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
141-
&& mkdir -p /config/configDropins/defaults \
142-
&& mkdir -p /config/configDropins/overrides \
143-
&& chown -R 1001:0 /config \
144-
&& chmod -R g+rw /config \
145136
&& chown -R 1001:0 /opt/ibm/helpers \
146137
&& chmod -R g+rwx /opt/ibm/helpers \
147138
&& chown -R 1001:0 /opt/ibm/fixes \
148139
&& chmod -R g+rwx /opt/ibm/fixes \
149140
&& chown -R 1001:0 /opt/ibm/wlp/usr \
150141
&& chmod -R g+rw /opt/ibm/wlp/usr \
151-
&& chown -R 1001:0 /opt/ibm/wlp/output \
152-
&& chmod -R g+rw /opt/ibm/wlp/output \
153142
&& chown -R 1001:0 /logs \
154143
&& chmod -R g+rw /logs \
155144
&& chown -R 1001:0 /etc/wlp \
156145
&& chmod -R g+rw /etc/wlp \
157146
&& chown -R 1001:0 /home/default \
158-
&& chmod -R g+rw /home/default
147+
&& chmod -R g+rw /home/default \
148+
&& mkdir -p /opt/ibm/links \
149+
&& chown -R 1001:0 /opt/ibm/links \
150+
&& chmod -R g+rw /opt/ibm/links
151+
152+
# Create second-level symlinks as non-root user
153+
USER 1001
154+
155+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
156+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
157+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
158+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
159+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
160+
161+
# Create first-level symlinks as root user
162+
USER 0
163+
164+
RUN mkdir /output \
165+
&& chmod -t /output \
166+
&& rm -rf /output \
167+
&& ln -s /opt/ibm/links/output /output \
168+
&& ln -s /opt/ibm/links/config /config \
169+
&& chown -R 1001:0 /opt/ibm/links/output \
170+
&& chmod -R g+rw /opt/ibm/links/output \
171+
&& chown -R 1001:0 /opt/ibm/links/config \
172+
&& chmod -R g+rw /opt/ibm/links/config \
173+
&& chown -R 1001:0 /config \
174+
&& chmod -R g+rw /config \
175+
&& chown -R 1001:0 /output \
176+
&& chmod -R g+rw /output
159177

160178
# Create a new SCC layer
161179
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -172,4 +190,4 @@ USER 1001
172190
EXPOSE 9080 9443
173191

174192
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
175-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
193+
CMD ["/opt/ibm/wlp/bin/server", "run"]

‎ga/latest/kernel/Dockerfile.ubi.openjdk11‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,32 +130,50 @@ RUN mkdir /logs \
130130
&& mkdir /etc/wlp \
131131
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
132132
&& mkdir -p /home/default \
133-
&& mkdir /output \
134-
&& chmod -t /output \
135-
&& rm -rf /output \
136-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
137-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
138133
&& ln -s /opt/ibm /liberty \
139134
&& ln -s /opt/ibm/fixes /fixes \
140135
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
141-
&& mkdir -p /config/configDropins/defaults \
142-
&& mkdir -p /config/configDropins/overrides \
143-
&& chown -R 1001:0 /config \
144-
&& chmod -R g+rw /config \
145136
&& chown -R 1001:0 /opt/ibm/helpers \
146137
&& chmod -R g+rwx /opt/ibm/helpers \
147138
&& chown -R 1001:0 /opt/ibm/fixes \
148139
&& chmod -R g+rwx /opt/ibm/fixes \
149140
&& chown -R 1001:0 /opt/ibm/wlp/usr \
150141
&& chmod -R g+rw /opt/ibm/wlp/usr \
151-
&& chown -R 1001:0 /opt/ibm/wlp/output \
152-
&& chmod -R g+rw /opt/ibm/wlp/output \
153142
&& chown -R 1001:0 /logs \
154143
&& chmod -R g+rw /logs \
155144
&& chown -R 1001:0 /etc/wlp \
156145
&& chmod -R g+rw /etc/wlp \
157146
&& chown -R 1001:0 /home/default \
158-
&& chmod -R g+rw /home/default
147+
&& chmod -R g+rw /home/default \
148+
&& mkdir -p /opt/ibm/links \
149+
&& chown -R 1001:0 /opt/ibm/links \
150+
&& chmod -R g+rw /opt/ibm/links
151+
152+
# Create second-level symlinks as non-root user
153+
USER 1001
154+
155+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
156+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
157+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
158+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
159+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
160+
161+
# Create first-level symlinks as root user
162+
USER 0
163+
164+
RUN mkdir /output \
165+
&& chmod -t /output \
166+
&& rm -rf /output \
167+
&& ln -s /opt/ibm/links/output /output \
168+
&& ln -s /opt/ibm/links/config /config \
169+
&& chown -R 1001:0 /opt/ibm/links/output \
170+
&& chmod -R g+rw /opt/ibm/links/output \
171+
&& chown -R 1001:0 /opt/ibm/links/config \
172+
&& chmod -R g+rw /opt/ibm/links/config \
173+
&& chown -R 1001:0 /config \
174+
&& chmod -R g+rw /config \
175+
&& chown -R 1001:0 /output \
176+
&& chmod -R g+rw /output
159177

160178
# Create a new SCC layer
161179
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -172,4 +190,4 @@ USER 1001
172190
EXPOSE 9080 9443
173191

174192
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
175-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
193+
CMD ["/opt/ibm/wlp/bin/server", "run"]

‎ga/latest/kernel/Dockerfile.ubi.openjdk17‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,32 +130,50 @@ RUN mkdir /logs \
130130
&& mkdir /etc/wlp \
131131
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
132132
&& mkdir -p /home/default \
133-
&& mkdir /output \
134-
&& chmod -t /output \
135-
&& rm -rf /output \
136-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
137-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
138133
&& ln -s /opt/ibm /liberty \
139134
&& ln -s /opt/ibm/fixes /fixes \
140135
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
141-
&& mkdir -p /config/configDropins/defaults \
142-
&& mkdir -p /config/configDropins/overrides \
143-
&& chown -R 1001:0 /config \
144-
&& chmod -R g+rw /config \
145136
&& chown -R 1001:0 /opt/ibm/helpers \
146137
&& chmod -R g+rwx /opt/ibm/helpers \
147138
&& chown -R 1001:0 /opt/ibm/fixes \
148139
&& chmod -R g+rwx /opt/ibm/fixes \
149140
&& chown -R 1001:0 /opt/ibm/wlp/usr \
150141
&& chmod -R g+rw /opt/ibm/wlp/usr \
151-
&& chown -R 1001:0 /opt/ibm/wlp/output \
152-
&& chmod -R g+rw /opt/ibm/wlp/output \
153142
&& chown -R 1001:0 /logs \
154143
&& chmod -R g+rw /logs \
155144
&& chown -R 1001:0 /etc/wlp \
156145
&& chmod -R g+rw /etc/wlp \
157146
&& chown -R 1001:0 /home/default \
158-
&& chmod -R g+rw /home/default
147+
&& chmod -R g+rw /home/default \
148+
&& mkdir -p /opt/ibm/links \
149+
&& chown -R 1001:0 /opt/ibm/links \
150+
&& chmod -R g+rw /opt/ibm/links
151+
152+
# Create second-level symlinks as non-root user
153+
USER 1001
154+
155+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
156+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
157+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
158+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
159+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
160+
161+
# Create first-level symlinks as root user
162+
USER 0
163+
164+
RUN mkdir /output \
165+
&& chmod -t /output \
166+
&& rm -rf /output \
167+
&& ln -s /opt/ibm/links/output /output \
168+
&& ln -s /opt/ibm/links/config /config \
169+
&& chown -R 1001:0 /opt/ibm/links/output \
170+
&& chmod -R g+rw /opt/ibm/links/output \
171+
&& chown -R 1001:0 /opt/ibm/links/config \
172+
&& chmod -R g+rw /opt/ibm/links/config \
173+
&& chown -R 1001:0 /config \
174+
&& chmod -R g+rw /config \
175+
&& chown -R 1001:0 /output \
176+
&& chmod -R g+rw /output
159177

160178
# Create a new SCC layer
161179
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -172,4 +190,4 @@ USER 1001
172190
EXPOSE 9080 9443
173191

174192
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
175-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
193+
CMD ["/opt/ibm/wlp/bin/server", "run"]

‎ga/latest/kernel/Dockerfile.ubi.openjdk8‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,32 +130,50 @@ RUN mkdir /logs \
130130
&& mkdir /etc/wlp \
131131
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
132132
&& mkdir -p /home/default \
133-
&& mkdir /output \
134-
&& chmod -t /output \
135-
&& rm -rf /output \
136-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
137-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
138133
&& ln -s /opt/ibm /liberty \
139134
&& ln -s /opt/ibm/fixes /fixes \
140135
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
141-
&& mkdir -p /config/configDropins/defaults \
142-
&& mkdir -p /config/configDropins/overrides \
143-
&& chown -R 1001:0 /config \
144-
&& chmod -R g+rw /config \
145136
&& chown -R 1001:0 /opt/ibm/helpers \
146137
&& chmod -R g+rwx /opt/ibm/helpers \
147138
&& chown -R 1001:0 /opt/ibm/fixes \
148139
&& chmod -R g+rwx /opt/ibm/fixes \
149140
&& chown -R 1001:0 /opt/ibm/wlp/usr \
150141
&& chmod -R g+rw /opt/ibm/wlp/usr \
151-
&& chown -R 1001:0 /opt/ibm/wlp/output \
152-
&& chmod -R g+rw /opt/ibm/wlp/output \
153142
&& chown -R 1001:0 /logs \
154143
&& chmod -R g+rw /logs \
155144
&& chown -R 1001:0 /etc/wlp \
156145
&& chmod -R g+rw /etc/wlp \
157146
&& chown -R 1001:0 /home/default \
158-
&& chmod -R g+rw /home/default
147+
&& chmod -R g+rw /home/default \
148+
&& mkdir -p /opt/ibm/links \
149+
&& chown -R 1001:0 /opt/ibm/links \
150+
&& chmod -R g+rw /opt/ibm/links
151+
152+
# Create second-level symlinks as non-root user
153+
USER 1001
154+
155+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
156+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
157+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
158+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
159+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
160+
161+
# Create first-level symlinks as root user
162+
USER 0
163+
164+
RUN mkdir /output \
165+
&& chmod -t /output \
166+
&& rm -rf /output \
167+
&& ln -s /opt/ibm/links/output /output \
168+
&& ln -s /opt/ibm/links/config /config \
169+
&& chown -R 1001:0 /opt/ibm/links/output \
170+
&& chmod -R g+rw /opt/ibm/links/output \
171+
&& chown -R 1001:0 /opt/ibm/links/config \
172+
&& chmod -R g+rw /opt/ibm/links/config \
173+
&& chown -R 1001:0 /config \
174+
&& chmod -R g+rw /config \
175+
&& chown -R 1001:0 /output \
176+
&& chmod -R g+rw /output
159177

160178
# Create a new SCC layer
161179
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -172,4 +190,4 @@ USER 1001
172190
EXPOSE 9080 9443
173191

174192
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
175-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
193+
CMD ["/opt/ibm/wlp/bin/server", "run"]

‎ga/latest/kernel/Dockerfile.ubuntu.ibmjava8‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,32 +130,50 @@ RUN mkdir /logs \
130130
&& mkdir /etc/wlp \
131131
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
132132
&& mkdir -p /home/default \
133-
&& mkdir /output \
134-
&& chmod -t /output \
135-
&& rm -rf /output \
136-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
137-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
138133
&& ln -s /opt/ibm /liberty \
139134
&& ln -s /opt/ibm/fixes /fixes \
140135
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
141-
&& mkdir -p /config/configDropins/defaults \
142-
&& mkdir -p /config/configDropins/overrides \
143-
&& chown -R 1001:0 /config \
144-
&& chmod -R g+rw /config \
145136
&& chown -R 1001:0 /opt/ibm/helpers \
146137
&& chmod -R g+rwx /opt/ibm/helpers \
147138
&& chown -R 1001:0 /opt/ibm/fixes \
148139
&& chmod -R g+rwx /opt/ibm/fixes \
149140
&& chown -R 1001:0 /opt/ibm/wlp/usr \
150141
&& chmod -R g+rw /opt/ibm/wlp/usr \
151-
&& chown -R 1001:0 /opt/ibm/wlp/output \
152-
&& chmod -R g+rw /opt/ibm/wlp/output \
153142
&& chown -R 1001:0 /logs \
154143
&& chmod -R g+rw /logs \
155144
&& chown -R 1001:0 /etc/wlp \
156145
&& chmod -R g+rw /etc/wlp \
157146
&& chown -R 1001:0 /home/default \
158-
&& chmod -R g+rw /home/default
147+
&& chmod -R g+rw /home/default \
148+
&& mkdir -p /opt/ibm/links \
149+
&& chown -R 1001:0 /opt/ibm/links \
150+
&& chmod -R g+rw /opt/ibm/links
151+
152+
# Create second-level symlinks as non-root user
153+
USER 1001
154+
155+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
156+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
157+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
158+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
159+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
160+
161+
# Create first-level symlinks as root user
162+
USER 0
163+
164+
RUN mkdir /output \
165+
&& chmod -t /output \
166+
&& rm -rf /output \
167+
&& ln -s /opt/ibm/links/output /output \
168+
&& ln -s /opt/ibm/links/config /config \
169+
&& chown -R 1001:0 /opt/ibm/links/output \
170+
&& chmod -R g+rw /opt/ibm/links/output \
171+
&& chown -R 1001:0 /opt/ibm/links/config \
172+
&& chmod -R g+rw /opt/ibm/links/config \
173+
&& chown -R 1001:0 /config \
174+
&& chmod -R g+rw /config \
175+
&& chown -R 1001:0 /output \
176+
&& chmod -R g+rw /output
159177

160178
# Create a new SCC layer
161179
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -172,4 +190,4 @@ USER 1001
172190
EXPOSE 9080 9443
173191

174192
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
175-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
193+
CMD ["/opt/ibm/wlp/bin/server", "run"]

0 commit comments

Comments
 (0)