Skip to content

Commit 6620395

Browse files
kabicinkabicin
committed
Resolve server name changes lost in merge conflict
1 parent d3f4097 commit 6620395

File tree

7 files changed

+210
-70
lines changed

7 files changed

+210
-70
lines changed

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

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,9 @@ RUN mkdir /logs \
8585
&& mkdir /etc/wlp \
8686
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8787
&& mkdir -p /home/default \
88-
&& mkdir /output \
89-
&& chmod -t /output \
90-
&& rm -rf /output \
91-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
92-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9388
&& ln -s /opt/ibm /liberty \
9489
&& ln -s /opt/ibm/fixes /fixes \
9590
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
96-
&& mkdir -p /config/configDropins/defaults \
97-
&& mkdir -p /config/configDropins/overrides \
98-
&& chown -R 1001:0 /config \
99-
&& chmod -R g+rw /config \
10091
&& chown -R 1001:0 /opt/ibm/helpers \
10192
&& chmod -R g+rwx /opt/ibm/helpers \
10293
&& chown -R 1001:0 /opt/ibm/fixes \
@@ -110,7 +101,36 @@ RUN mkdir /logs \
110101
&& chown -R 1001:0 /etc/wlp \
111102
&& chmod -R g+rw /etc/wlp \
112103
&& chown -R 1001:0 /home/default \
113-
&& chmod -R g+rw /home/default
104+
&& chmod -R g+rw /home/default \
105+
&& mkdir -p /opt/ibm/links \
106+
&& chown -R 1001:0 /opt/ibm/links \
107+
&& chmod -R g+rw /opt/ibm/links
108+
109+
# Create second-level symlinks as non-root user
110+
USER 1001
111+
112+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
113+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
114+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
115+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
116+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
117+
118+
# Create first-level symlinks as root user
119+
USER 0
120+
121+
RUN mkdir /output \
122+
&& chmod -t /output \
123+
&& rm -rf /output \
124+
&& ln -s /opt/ibm/links/output /output \
125+
&& ln -s /opt/ibm/links/config /config \
126+
&& chown -R 1001:0 /opt/ibm/links/output \
127+
&& chmod -R g+rw /opt/ibm/links/output \
128+
&& chown -R 1001:0 /opt/ibm/links/config \
129+
&& chmod -R g+rw /opt/ibm/links/config \
130+
&& chown -R 1001:0 /config \
131+
&& chmod -R g+rw /config \
132+
&& chown -R 1001:0 /output \
133+
&& chmod -R g+rw /output
114134

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

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

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,9 @@ RUN mkdir /logs \
8686
&& mkdir /etc/wlp \
8787
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8888
&& mkdir -p /home/default \
89-
&& mkdir /output \
90-
&& chmod -t /output \
91-
&& rm -rf /output \
92-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
93-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9489
&& ln -s /opt/ibm /liberty \
9590
&& ln -s /opt/ibm/fixes /fixes \
9691
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
97-
&& mkdir -p /config/configDropins/defaults \
98-
&& mkdir -p /config/configDropins/overrides \
99-
&& chown -R 1001:0 /config \
100-
&& chmod -R g+rw /config \
10192
&& chown -R 1001:0 /opt/ibm/helpers \
10293
&& chmod -R g+rwx /opt/ibm/helpers \
10394
&& chown -R 1001:0 /opt/ibm/fixes \
@@ -111,7 +102,36 @@ RUN mkdir /logs \
111102
&& chown -R 1001:0 /etc/wlp \
112103
&& chmod -R g+rw /etc/wlp \
113104
&& chown -R 1001:0 /home/default \
114-
&& chmod -R g+rw /home/default
105+
&& chmod -R g+rw /home/default \
106+
&& mkdir -p /opt/ibm/links \
107+
&& chown -R 1001:0 /opt/ibm/links \
108+
&& chmod -R g+rw /opt/ibm/links
109+
110+
# Create second-level symlinks as non-root user
111+
USER 1001
112+
113+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
115+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
116+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
117+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
118+
119+
# Create first-level symlinks as root user
120+
USER 0
121+
122+
RUN mkdir /output \
123+
&& chmod -t /output \
124+
&& rm -rf /output \
125+
&& ln -s /opt/ibm/links/output /output \
126+
&& ln -s /opt/ibm/links/config /config \
127+
&& chown -R 1001:0 /opt/ibm/links/output \
128+
&& chmod -R g+rw /opt/ibm/links/output \
129+
&& chown -R 1001:0 /opt/ibm/links/config \
130+
&& chmod -R g+rw /opt/ibm/links/config \
131+
&& chown -R 1001:0 /config \
132+
&& chmod -R g+rw /config \
133+
&& chown -R 1001:0 /output \
134+
&& chmod -R g+rw /output
115135

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

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

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,9 @@ RUN mkdir /logs \
8686
&& mkdir /etc/wlp \
8787
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8888
&& mkdir -p /home/default \
89-
&& mkdir /output \
90-
&& chmod -t /output \
91-
&& rm -rf /output \
92-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
93-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9489
&& ln -s /opt/ibm /liberty \
9590
&& ln -s /opt/ibm/fixes /fixes \
9691
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
97-
&& mkdir -p /config/configDropins/defaults \
98-
&& mkdir -p /config/configDropins/overrides \
99-
&& chown -R 1001:0 /config \
100-
&& chmod -R g+rw /config \
10192
&& chown -R 1001:0 /opt/ibm/helpers \
10293
&& chmod -R g+rwx /opt/ibm/helpers \
10394
&& chown -R 1001:0 /opt/ibm/fixes \
@@ -111,7 +102,36 @@ RUN mkdir /logs \
111102
&& chown -R 1001:0 /etc/wlp \
112103
&& chmod -R g+rw /etc/wlp \
113104
&& chown -R 1001:0 /home/default \
114-
&& chmod -R g+rw /home/default
105+
&& chmod -R g+rw /home/default \
106+
&& mkdir -p /opt/ibm/links \
107+
&& chown -R 1001:0 /opt/ibm/links \
108+
&& chmod -R g+rw /opt/ibm/links
109+
110+
# Create second-level symlinks as non-root user
111+
USER 1001
112+
113+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
115+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
116+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
117+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
118+
119+
# Create first-level symlinks as root user
120+
USER 0
121+
122+
RUN mkdir /output \
123+
&& chmod -t /output \
124+
&& rm -rf /output \
125+
&& ln -s /opt/ibm/links/output /output \
126+
&& ln -s /opt/ibm/links/config /config \
127+
&& chown -R 1001:0 /opt/ibm/links/output \
128+
&& chmod -R g+rw /opt/ibm/links/output \
129+
&& chown -R 1001:0 /opt/ibm/links/config \
130+
&& chmod -R g+rw /opt/ibm/links/config \
131+
&& chown -R 1001:0 /config \
132+
&& chmod -R g+rw /config \
133+
&& chown -R 1001:0 /output \
134+
&& chmod -R g+rw /output
115135

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

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

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,9 @@ RUN mkdir /logs \
8686
&& mkdir /etc/wlp \
8787
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8888
&& mkdir -p /home/default \
89-
&& mkdir /output \
90-
&& chmod -t /output \
91-
&& rm -rf /output \
92-
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
93-
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
9489
&& ln -s /opt/ibm /liberty \
9590
&& ln -s /opt/ibm/fixes /fixes \
9691
&& ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
97-
&& mkdir -p /config/configDropins/defaults \
98-
&& mkdir -p /config/configDropins/overrides \
99-
&& chown -R 1001:0 /config \
100-
&& chmod -R g+rw /config \
10192
&& chown -R 1001:0 /opt/ibm/helpers \
10293
&& chmod -R g+rwx /opt/ibm/helpers \
10394
&& chown -R 1001:0 /opt/ibm/fixes \
@@ -111,7 +102,36 @@ RUN mkdir /logs \
111102
&& chown -R 1001:0 /etc/wlp \
112103
&& chmod -R g+rw /etc/wlp \
113104
&& chown -R 1001:0 /home/default \
114-
&& chmod -R g+rw /home/default
105+
&& chmod -R g+rw /home/default \
106+
&& mkdir -p /opt/ibm/links \
107+
&& chown -R 1001:0 /opt/ibm/links \
108+
&& chmod -R g+rw /opt/ibm/links
109+
110+
# Create second-level symlinks as non-root user
111+
USER 1001
112+
113+
RUN mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114+
&& ln -s $WLP_OUTPUT_DIR/defaultServer /opt/ibm/links/output \
115+
&& ln -s /opt/ibm/wlp/usr/servers/defaultServer /opt/ibm/links/config \
116+
&& mkdir -p /opt/ibm/links/config/configDropins/defaults \
117+
&& mkdir -p /opt/ibm/links/config/configDropins/overrides
118+
119+
# Create first-level symlinks as root user
120+
USER 0
121+
122+
RUN mkdir /output \
123+
&& chmod -t /output \
124+
&& rm -rf /output \
125+
&& ln -s /opt/ibm/links/output /output \
126+
&& ln -s /opt/ibm/links/config /config \
127+
&& chown -R 1001:0 /opt/ibm/links/output \
128+
&& chmod -R g+rw /opt/ibm/links/output \
129+
&& chown -R 1001:0 /opt/ibm/links/config \
130+
&& chmod -R g+rw /opt/ibm/links/config \
131+
&& chown -R 1001:0 /config \
132+
&& chmod -R g+rw /config \
133+
&& chown -R 1001:0 /output \
134+
&& chmod -R g+rw /output
115135

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

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

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,9 @@ RUN mkdir /logs \
8484
&& mkdir /etc/wlp \
8585
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8686
&& 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 \
9287
&& ln -s /opt/ibm /liberty \
9388
&& ln -s /opt/ibm/fixes /fixes \
9489
&& 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 \
9990
&& chown -R 1001:0 /opt/ibm/helpers \
10091
&& chmod -R g+rwx /opt/ibm/helpers \
10192
&& chown -R 1001:0 /opt/ibm/fixes \
@@ -109,7 +100,36 @@ RUN mkdir /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 \

‎ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk11‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,9 @@ RUN mkdir /logs \
8484
&& mkdir /etc/wlp \
8585
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8686
&& 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 \
9287
&& ln -s /opt/ibm /liberty \
9388
&& ln -s /opt/ibm/fixes /fixes \
9489
&& 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 \
9990
&& chown -R 1001:0 /opt/ibm/helpers \
10091
&& chmod -R g+rwx /opt/ibm/helpers \
10192
&& chown -R 1001:0 /opt/ibm/fixes \
@@ -109,7 +100,36 @@ RUN mkdir /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 \

‎ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk17‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,9 @@ RUN mkdir /logs \
8484
&& mkdir /etc/wlp \
8585
&& mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
8686
&& 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 \
9287
&& ln -s /opt/ibm /liberty \
9388
&& ln -s /opt/ibm/fixes /fixes \
9489
&& 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 \
9990
&& chown -R 1001:0 /opt/ibm/helpers \
10091
&& chmod -R g+rwx /opt/ibm/helpers \
10192
&& chown -R 1001:0 /opt/ibm/fixes \
@@ -109,7 +100,36 @@ RUN mkdir /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 \

0 commit comments

Comments
 (0)