Skip to content

Commit bf20717

Browse files
kabicinkabicin
committed
Add defaultServer name change feature
1 parent fc24b9d commit bf20717

File tree

7 files changed

+231
-91
lines changed

7 files changed

+231
-91
lines changed

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

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ARG EN_SHA=16669604ed86a6ad4bd60b99ca85fad2a819ae3ff3e68d5585a64f3d51504ee3
2020
ARG NON_IBM_SHA=89faf793b9e068a80bda72d6c1cbf9b4e1362c699525710ae3247a6c135a0b11
2121
ARG NOTICES_SHA=f02cefd8eb429cd471b9f494c2ac7f3df10ef042f1b7e8271895afd2a46ae997
2222

23+
ENV SERVER_NAME=defaultServer
24+
2325
LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
2426
org.opencontainers.image.vendor="IBM" \
2527
org.opencontainers.image.url="http://wasdev.net" \
@@ -83,32 +85,50 @@ RUN mkdir /logs \
8385
&& mkdir /etc/wlp \
8486
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8587
&& mkdir -p /home/default \
86-
&& mkdir /output \
87-
&& chmod -t /output \
88-
&& rm -rf /output \
89-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
90-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9188
&& ln -s /opt/ibm /liberty \
9289
&& ln -s /opt/ibm/fixes /fixes \
9390
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
94-
&& mkdir -p /config/configDropins/defaults \
95-
&& mkdir -p /config/configDropins/overrides \
96-
&& chown -R 1001:0 /config \
97-
&& chmod -R g+rw /config \
9891
&& chown -R 1001:0 /opt/ibm/helpers \
9992
&& chmod -R g+rwx /opt/ibm/helpers \
10093
&& chown -R 1001:0 /opt/ibm/fixes \
10194
&& chmod -R g+rwx /opt/ibm/fixes \
10295
&& chown -R 1001:0 /opt/ibm/wlp/usr \
10396
&& chmod -R g+rw /opt/ibm/wlp/usr \
104-
&& chown -R 1001:0 /opt/ibm/wlp/output \
105-
&& chmod -R g+rw /opt/ibm/wlp/output \
10697
&& chown -R 1001:0 /logs \
10798
&& chmod -R g+rw /logs \
10899
&& chown -R 1001:0 /etc/wlp \
109100
&& chmod -R g+rw /etc/wlp \
110101
&& chown -R 1001:0 /home/default \
111-
&& chmod -R g+rw /home/default
102+
&& chmod -R g+rw /home/default \
103+
&& mkdir -p /opt/ibm/links \
104+
&& chown -R 1001:0 /opt/ibm/links \
105+
&& chmod -R g+rw /opt/ibm/links
106+
107+
# Create second-level symlinks as non-root user
108+
USER 1001
109+
110+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
111+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
112+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
113+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
114+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
115+
116+
# Create first-level symlinks as root user
117+
USER 0
118+
119+
RUN mkdir /output \
120+
&& chmod -t /output \
121+
&& rm -rf /output \
122+
&& ln -s /opt/ibm/links/output /output \
123+
&& ln -s /opt/ibm/links/config /config \
124+
&& chown -R 1001:0 /opt/ibm/links/output \
125+
&& chmod -R g+rw /opt/ibm/links/output \
126+
&& chown -R 1001:0 /opt/ibm/links/config \
127+
&& chmod -R g+rw /opt/ibm/links/config \
128+
&& chown -R 1001:0 /config \
129+
&& chmod -R g+rw /config \
130+
&& chown -R 1001:0 /output \
131+
&& chmod -R g+rw /output
112132

113133
# Create a new SCC layer
114134
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -125,4 +145,4 @@ USER 1001
125145
EXPOSE 9080 9443
126146

127147
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
128-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
148+
CMD ["/opt/ibm/wlp/bin/server", "run"]

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

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ARG EN_SHA=16669604ed86a6ad4bd60b99ca85fad2a819ae3ff3e68d5585a64f3d51504ee3
2020
ARG NON_IBM_SHA=89faf793b9e068a80bda72d6c1cbf9b4e1362c699525710ae3247a6c135a0b11
2121
ARG NOTICES_SHA=f02cefd8eb429cd471b9f494c2ac7f3df10ef042f1b7e8271895afd2a46ae997
2222

23+
ENV SERVER_NAME=defaultServer
24+
2325
LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
2426
org.opencontainers.image.vendor="IBM" \
2527
org.opencontainers.image.url="http://wasdev.net" \
@@ -84,32 +86,50 @@ RUN mkdir /logs \
8486
&& mkdir /etc/wlp \
8587
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8688
&& mkdir -p /home/default \
87-
&& mkdir /output \
88-
&& chmod -t /output \
89-
&& rm -rf /output \
90-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
91-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9289
&& ln -s /opt/ibm /liberty \
9390
&& ln -s /opt/ibm/fixes /fixes \
9491
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
95-
&& mkdir -p /config/configDropins/defaults \
96-
&& mkdir -p /config/configDropins/overrides \
97-
&& chown -R 1001:0 /config \
98-
&& chmod -R g+rw /config \
9992
&& chown -R 1001:0 /opt/ibm/helpers \
10093
&& chmod -R g+rwx /opt/ibm/helpers \
10194
&& chown -R 1001:0 /opt/ibm/fixes \
10295
&& chmod -R g+rwx /opt/ibm/fixes \
10396
&& chown -R 1001:0 /opt/ibm/wlp/usr \
10497
&& chmod -R g+rw /opt/ibm/wlp/usr \
105-
&& chown -R 1001:0 /opt/ibm/wlp/output \
106-
&& chmod -R g+rw /opt/ibm/wlp/output \
10798
&& chown -R 1001:0 /logs \
10899
&& chmod -R g+rw /logs \
109100
&& chown -R 1001:0 /etc/wlp \
110101
&& chmod -R g+rw /etc/wlp \
111102
&& chown -R 1001:0 /home/default \
112-
&& chmod -R g+rw /home/default
103+
&& chmod -R g+rw /home/default \
104+
&& mkdir -p /opt/ibm/links \
105+
&& chown -R 1001:0 /opt/ibm/links \
106+
&& chmod -R g+rw /opt/ibm/links
107+
108+
# Create second-level symlinks as non-root user
109+
USER 1001
110+
111+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
112+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
113+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
114+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
115+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
116+
117+
# Create first-level symlinks as root user
118+
USER 0
119+
120+
RUN mkdir /output \
121+
&& chmod -t /output \
122+
&& rm -rf /output \
123+
&& ln -s /opt/ibm/links/output /output \
124+
&& ln -s /opt/ibm/links/config /config \
125+
&& chown -R 1001:0 /opt/ibm/links/output \
126+
&& chmod -R g+rw /opt/ibm/links/output \
127+
&& chown -R 1001:0 /opt/ibm/links/config \
128+
&& chmod -R g+rw /opt/ibm/links/config \
129+
&& chown -R 1001:0 /config \
130+
&& chmod -R g+rw /config \
131+
&& chown -R 1001:0 /output \
132+
&& chmod -R g+rw /output
113133

114134
# Create a new SCC layer
115135
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -126,4 +146,4 @@ USER 1001
126146
EXPOSE 9080 9443
127147

128148
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
129-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
149+
CMD ["/opt/ibm/wlp/bin/server", "run"]

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

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ARG EN_SHA=16669604ed86a6ad4bd60b99ca85fad2a819ae3ff3e68d5585a64f3d51504ee3
2020
ARG NON_IBM_SHA=89faf793b9e068a80bda72d6c1cbf9b4e1362c699525710ae3247a6c135a0b11
2121
ARG NOTICES_SHA=f02cefd8eb429cd471b9f494c2ac7f3df10ef042f1b7e8271895afd2a46ae997
2222

23+
ENV SERVER_NAME=defaultServer
24+
2325
LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Chris Potter, Melissa Lee" \
2426
org.opencontainers.image.vendor="IBM" \
2527
org.opencontainers.image.url="http://wasdev.net" \
@@ -84,32 +86,50 @@ RUN mkdir /logs \
8486
&& mkdir /etc/wlp \
8587
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8688
&& mkdir -p /home/default \
87-
&& mkdir /output \
88-
&& chmod -t /output \
89-
&& rm -rf /output \
90-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
91-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9289
&& ln -s /opt/ibm /liberty \
9390
&& ln -s /opt/ibm/fixes /fixes \
9491
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
95-
&& mkdir -p /config/configDropins/defaults \
96-
&& mkdir -p /config/configDropins/overrides \
97-
&& chown -R 1001:0 /config \
98-
&& chmod -R g+rw /config \
9992
&& chown -R 1001:0 /opt/ibm/helpers \
10093
&& chmod -R g+rwx /opt/ibm/helpers \
10194
&& chown -R 1001:0 /opt/ibm/fixes \
10295
&& chmod -R g+rwx /opt/ibm/fixes \
10396
&& chown -R 1001:0 /opt/ibm/wlp/usr \
10497
&& chmod -R g+rw /opt/ibm/wlp/usr \
105-
&& chown -R 1001:0 /opt/ibm/wlp/output \
106-
&& chmod -R g+rw /opt/ibm/wlp/output \
10798
&& chown -R 1001:0 /logs \
10899
&& chmod -R g+rw /logs \
109100
&& chown -R 1001:0 /etc/wlp \
110101
&& chmod -R g+rw /etc/wlp \
111102
&& chown -R 1001:0 /home/default \
112-
&& chmod -R g+rw /home/default
103+
&& chmod -R g+rw /home/default \
104+
&& mkdir -p /opt/ibm/links \
105+
&& chown -R 1001:0 /opt/ibm/links \
106+
&& chmod -R g+rw /opt/ibm/links
107+
108+
# Create second-level symlinks as non-root user
109+
USER 1001
110+
111+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
112+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
113+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
114+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
115+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
116+
117+
# Create first-level symlinks as root user
118+
USER 0
119+
120+
RUN mkdir /output \
121+
&& chmod -t /output \
122+
&& rm -rf /output \
123+
&& ln -s /opt/ibm/links/output /output \
124+
&& ln -s /opt/ibm/links/config /config \
125+
&& chown -R 1001:0 /opt/ibm/links/output \
126+
&& chmod -R g+rw /opt/ibm/links/output \
127+
&& chown -R 1001:0 /opt/ibm/links/config \
128+
&& chmod -R g+rw /opt/ibm/links/config \
129+
&& chown -R 1001:0 /config \
130+
&& chmod -R g+rw /config \
131+
&& chown -R 1001:0 /output \
132+
&& chmod -R g+rw /output
113133

114134
# Create a new SCC layer
115135
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -126,4 +146,4 @@ USER 1001
126146
EXPOSE 9080 9443
127147

128148
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
129-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
149+
CMD ["/opt/ibm/wlp/bin/server", "run"]

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

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ARG EN_SHA=16669604ed86a6ad4bd60b99ca85fad2a819ae3ff3e68d5585a64f3d51504ee3
2020
ARG NON_IBM_SHA=89faf793b9e068a80bda72d6c1cbf9b4e1362c699525710ae3247a6c135a0b11
2121
ARG NOTICES_SHA=f02cefd8eb429cd471b9f494c2ac7f3df10ef042f1b7e8271895afd2a46ae997
2222

23+
ENV SERVER_NAME=defaultServer
24+
2325
LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
2426
org.opencontainers.image.vendor="IBM" \
2527
org.opencontainers.image.url="http://wasdev.net" \
@@ -84,32 +86,50 @@ RUN mkdir /logs \
8486
&& mkdir /etc/wlp \
8587
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8688
&& mkdir -p /home/default \
87-
&& mkdir /output \
88-
&& chmod -t /output \
89-
&& rm -rf /output \
90-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
91-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9289
&& ln -s /opt/ibm /liberty \
9390
&& ln -s /opt/ibm/fixes /fixes \
9491
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
95-
&& mkdir -p /config/configDropins/defaults \
96-
&& mkdir -p /config/configDropins/overrides \
97-
&& chown -R 1001:0 /config \
98-
&& chmod -R g+rw /config \
9992
&& chown -R 1001:0 /opt/ibm/helpers \
10093
&& chmod -R g+rwx /opt/ibm/helpers \
10194
&& chown -R 1001:0 /opt/ibm/fixes \
10295
&& chmod -R g+rwx /opt/ibm/fixes \
10396
&& chown -R 1001:0 /opt/ibm/wlp/usr \
10497
&& chmod -R g+rw /opt/ibm/wlp/usr \
105-
&& chown -R 1001:0 /opt/ibm/wlp/output \
106-
&& chmod -R g+rw /opt/ibm/wlp/output \
10798
&& chown -R 1001:0 /logs \
10899
&& chmod -R g+rw /logs \
109100
&& chown -R 1001:0 /etc/wlp \
110101
&& chmod -R g+rw /etc/wlp \
111102
&& chown -R 1001:0 /home/default \
112-
&& chmod -R g+rw /home/default
103+
&& chmod -R g+rw /home/default \
104+
&& mkdir -p /opt/ibm/links \
105+
&& chown -R 1001:0 /opt/ibm/links \
106+
&& chmod -R g+rw /opt/ibm/links
107+
108+
# Create second-level symlinks as non-root user
109+
USER 1001
110+
111+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
112+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
113+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
114+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
115+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
116+
117+
# Create first-level symlinks as root user
118+
USER 0
119+
120+
RUN mkdir /output \
121+
&& chmod -t /output \
122+
&& rm -rf /output \
123+
&& ln -s /opt/ibm/links/output /output \
124+
&& ln -s /opt/ibm/links/config /config \
125+
&& chown -R 1001:0 /opt/ibm/links/output \
126+
&& chmod -R g+rw /opt/ibm/links/output \
127+
&& chown -R 1001:0 /opt/ibm/links/config \
128+
&& chmod -R g+rw /opt/ibm/links/config \
129+
&& chown -R 1001:0 /config \
130+
&& chmod -R g+rw /config \
131+
&& chown -R 1001:0 /output \
132+
&& chmod -R g+rw /output
113133

114134
# Create a new SCC layer
115135
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -126,4 +146,4 @@ USER 1001
126146
EXPOSE 9080 9443
127147

128148
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
129-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
149+
CMD ["/opt/ibm/wlp/bin/server", "run"]

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

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ARG EN_SHA=16669604ed86a6ad4bd60b99ca85fad2a819ae3ff3e68d5585a64f3d51504ee3
2020
ARG NON_IBM_SHA=89faf793b9e068a80bda72d6c1cbf9b4e1362c699525710ae3247a6c135a0b11
2121
ARG NOTICES_SHA=f02cefd8eb429cd471b9f494c2ac7f3df10ef042f1b7e8271895afd2a46ae997
2222

23+
ENV SERVER_NAME=defaultServer
24+
2325
LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
2426
org.opencontainers.image.vendor="IBM" \
2527
org.opencontainers.image.url="http://wasdev.net" \
@@ -82,32 +84,50 @@ RUN mkdir /logs \
8284
&& mkdir /etc/wlp \
8385
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8486
&& mkdir -p /home/default \
85-
&& mkdir /output \
86-
&& chmod -t /output \
87-
&& rm -rf /output \
88-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
89-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9087
&& ln -s /opt/ibm /liberty \
9188
&& ln -s /opt/ibm/fixes /fixes \
9289
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
93-
&& mkdir -p /config/configDropins/defaults \
94-
&& mkdir -p /config/configDropins/overrides \
95-
&& chown -R 1001:0 /config \
96-
&& chmod -R g+rw /config \
9790
&& chown -R 1001:0 /opt/ibm/helpers \
9891
&& chmod -R g+rwx /opt/ibm/helpers \
9992
&& chown -R 1001:0 /opt/ibm/fixes \
10093
&& chmod -R g+rwx /opt/ibm/fixes \
10194
&& chown -R 1001:0 /opt/ibm/wlp/usr \
10295
&& chmod -R g+rw /opt/ibm/wlp/usr \
103-
&& chown -R 1001:0 /opt/ibm/wlp/output \
104-
&& chmod -R g+rw /opt/ibm/wlp/output \
10596
&& chown -R 1001:0 /logs \
10697
&& chmod -R g+rw /logs \
10798
&& chown -R 1001:0 /etc/wlp \
10899
&& chmod -R g+rw /etc/wlp \
109100
&& chown -R 1001:0 /home/default \
110-
&& chmod -R g+rw /home/default
101+
&& chmod -R g+rw /home/default \
102+
&& mkdir -p /opt/ibm/links \
103+
&& chown -R 1001:0 /opt/ibm/links \
104+
&& chmod -R g+rw /opt/ibm/links
105+
106+
# Create second-level symlinks as non-root user
107+
USER 1001
108+
109+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
110+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
111+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
112+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
113+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
114+
115+
# Create first-level symlinks as root user
116+
USER 0
117+
118+
RUN mkdir /output \
119+
&& chmod -t /output \
120+
&& rm -rf /output \
121+
&& ln -s /opt/ibm/links/output /output \
122+
&& ln -s /opt/ibm/links/config /config \
123+
&& chown -R 1001:0 /opt/ibm/links/output \
124+
&& chmod -R g+rw /opt/ibm/links/output \
125+
&& chown -R 1001:0 /opt/ibm/links/config \
126+
&& chmod -R g+rw /opt/ibm/links/config \
127+
&& chown -R 1001:0 /config \
128+
&& chmod -R g+rw /config \
129+
&& chown -R 1001:0 /output \
130+
&& chmod -R g+rw /output
111131

112132
# Create a new SCC layer
113133
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
@@ -124,4 +144,4 @@ USER 1001
124144
EXPOSE 9080 9443
125145

126146
ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"]
127-
CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"]
147+
CMD ["/opt/ibm/wlp/bin/server", "run"]

0 commit comments

Comments
 (0)