Skip to content

Commit 2cec754

Browse files
leochrleochr
authored
Merge pull request #721 from WASdev/vNext
Merge vNext commits into main for 25.0.0.10 release
2 parents 000bfc7 + 3959ddc commit 2cec754

File tree

97 files changed

+5299
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+5299
-94
lines changed

‎.secrets.baseline‎

Lines changed: 199 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": "fbf6a96d49214c0abc6a3bc5da6e48cd|REPLACE|PWD_TRUST|SECRET|keyStore|secret|rootpwd|dbpassword"
55
},
6-
"generated_at": "2025-09-11T13:25:02Z",
6+
"generated_at": "2025-09-24T15:36:30Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -97,6 +97,194 @@
9797
"verified_result": null
9898
}
9999
],
100+
"ga/25.0.0.10/full/server.xml": [
101+
{
102+
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
103+
"is_secret": false,
104+
"is_verified": false,
105+
"line_number": 16,
106+
"type": "Secret Keyword",
107+
"verified_result": null
108+
}
109+
],
110+
"ga/25.0.0.10/kernel/Dockerfile.ubi.ibmjava8": [
111+
{
112+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
113+
"is_secret": false,
114+
"is_verified": false,
115+
"line_number": 73,
116+
"type": "Hex High Entropy String",
117+
"verified_result": null
118+
}
119+
],
120+
"ga/25.0.0.10/kernel/Dockerfile.ubi.openjdk11": [
121+
{
122+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
123+
"is_secret": false,
124+
"is_verified": false,
125+
"line_number": 74,
126+
"type": "Hex High Entropy String",
127+
"verified_result": null
128+
}
129+
],
130+
"ga/25.0.0.10/kernel/Dockerfile.ubi.openjdk17": [
131+
{
132+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
133+
"is_secret": false,
134+
"is_verified": false,
135+
"line_number": 73,
136+
"type": "Hex High Entropy String",
137+
"verified_result": null
138+
}
139+
],
140+
"ga/25.0.0.10/kernel/Dockerfile.ubi.openjdk8": [
141+
{
142+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
143+
"is_secret": false,
144+
"is_verified": false,
145+
"line_number": 73,
146+
"type": "Hex High Entropy String",
147+
"verified_result": null
148+
}
149+
],
150+
"ga/25.0.0.10/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
151+
{
152+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
153+
"is_secret": false,
154+
"is_verified": false,
155+
"line_number": 84,
156+
"type": "Hex High Entropy String",
157+
"verified_result": null
158+
}
159+
],
160+
"ga/25.0.0.10/kernel/Dockerfile.ubi9-minimal.openjdk11": [
161+
{
162+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
163+
"is_secret": false,
164+
"is_verified": false,
165+
"line_number": 72,
166+
"type": "Hex High Entropy String",
167+
"verified_result": null
168+
}
169+
],
170+
"ga/25.0.0.10/kernel/Dockerfile.ubi9-minimal.openjdk17": [
171+
{
172+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
173+
"is_secret": false,
174+
"is_verified": false,
175+
"line_number": 72,
176+
"type": "Hex High Entropy String",
177+
"verified_result": null
178+
}
179+
],
180+
"ga/25.0.0.10/kernel/Dockerfile.ubi9-minimal.openjdk21": [
181+
{
182+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
183+
"is_secret": false,
184+
"is_verified": false,
185+
"line_number": 72,
186+
"type": "Hex High Entropy String",
187+
"verified_result": null
188+
}
189+
],
190+
"ga/25.0.0.10/kernel/Dockerfile.ubi9-minimal.openjdk25": [
191+
{
192+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
193+
"is_secret": false,
194+
"is_verified": false,
195+
"line_number": 72,
196+
"type": "Hex High Entropy String",
197+
"verified_result": null
198+
}
199+
],
200+
"ga/25.0.0.10/kernel/Dockerfile.ubi9-minimal.openjdk8": [
201+
{
202+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
203+
"is_secret": false,
204+
"is_verified": false,
205+
"line_number": 72,
206+
"type": "Hex High Entropy String",
207+
"verified_result": null
208+
}
209+
],
210+
"ga/25.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8": [
211+
{
212+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
213+
"is_secret": false,
214+
"is_verified": false,
215+
"line_number": 40,
216+
"type": "Hex High Entropy String",
217+
"verified_result": null
218+
}
219+
],
220+
"ga/25.0.0.10/kernel/Dockerfile.ubuntu.openjdk11": [
221+
{
222+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
223+
"is_secret": false,
224+
"is_verified": false,
225+
"line_number": 40,
226+
"type": "Hex High Entropy String",
227+
"verified_result": null
228+
}
229+
],
230+
"ga/25.0.0.10/kernel/Dockerfile.ubuntu.openjdk17": [
231+
{
232+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
233+
"is_secret": false,
234+
"is_verified": false,
235+
"line_number": 40,
236+
"type": "Hex High Entropy String",
237+
"verified_result": null
238+
}
239+
],
240+
"ga/25.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml": [
241+
{
242+
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
243+
"is_secret": false,
244+
"is_verified": false,
245+
"line_number": 2,
246+
"type": "Secret Keyword",
247+
"verified_result": null
248+
}
249+
],
250+
"ga/25.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml": [
251+
{
252+
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
253+
"is_secret": false,
254+
"is_verified": false,
255+
"line_number": 3,
256+
"type": "Secret Keyword",
257+
"verified_result": null
258+
}
259+
],
260+
"ga/25.0.0.10/kernel/helpers/runtime/docker-server.sh": [
261+
{
262+
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
263+
"is_secret": false,
264+
"is_verified": false,
265+
"line_number": 141,
266+
"type": "Secret Keyword",
267+
"verified_result": null
268+
}
269+
],
270+
"ga/25.0.0.10/oidcProvider/server.xml": [
271+
{
272+
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
273+
"is_secret": false,
274+
"is_verified": false,
275+
"line_number": 42,
276+
"type": "Secret Keyword",
277+
"verified_result": null
278+
},
279+
{
280+
"hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0",
281+
"is_secret": false,
282+
"is_verified": false,
283+
"line_number": 133,
284+
"type": "Secret Keyword",
285+
"verified_result": null
286+
}
287+
],
100288
"ga/25.0.0.3/full/server.xml": [
101289
{
102290
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
@@ -681,6 +869,16 @@
681869
"verified_result": null
682870
}
683871
],
872+
"ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk25": [
873+
{
874+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
875+
"is_secret": false,
876+
"is_verified": false,
877+
"line_number": 72,
878+
"type": "Hex High Entropy String",
879+
"verified_result": null
880+
}
881+
],
684882
"ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8": [
685883
{
686884
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",

‎ga/25.0.0.10/README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# WebSphere Application Server Developer Edition Liberty image
2+
3+
Under this directory you can find build scripts for WebSphere Application Server Liberty container images:
4+
5+
* [WebSphere Application Server Developer Edition Liberty, Kernel](kernel)
6+
* [WebSphere Application Server Developer Edition Liberty, Full](full)

‎ga/25.0.0.10/full/Dockerfile.ubi.ibmjava8‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.10-kernel-java8-ibmjava-ubi
16+
FROM $PARENT_IMAGE AS installBundle
17+
18+
ARG VERBOSE=false
19+
ARG REPOSITORIES_PROPERTIES=""
20+
21+
# If there is a local copy of the repository use that instead
22+
COPY resources/ /tmp/
23+
24+
# Install the base bundle
25+
RUN set -eux; \
26+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
27+
mkdir /opt/ibm/wlp/etc/; \
28+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
29+
installUtility install --acceptLicense baseBundle; \
30+
rm /opt/ibm/wlp/etc/repositories.properties; \
31+
elif [ -f /tmp/wlpRepo.zip ]; then \
32+
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
33+
else \
34+
installUtility install --acceptLicense baseBundle; \
35+
fi; \
36+
rm -rf /output/workarea /output/logs; \
37+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
38+
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.10-kernel-java8-ibmjava-ubi
40+
FROM $PARENT_IMAGE
41+
ARG VERBOSE=false
42+
43+
# Copy the runtime
44+
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
45+
46+
COPY --chown=1001:0 server.xml /config/
47+
48+
# Create a new SCC layer
49+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
50+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
51+
&& find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/25.0.0.10/full/Dockerfile.ubi.openjdk11‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.10-kernel-java11-openj9-ubi
16+
FROM $PARENT_IMAGE AS installBundle
17+
18+
ARG VERBOSE=false
19+
ARG REPOSITORIES_PROPERTIES=""
20+
21+
# If there is a local copy of the repository use that instead
22+
COPY resources/ /tmp/
23+
24+
# Install the base bundle
25+
RUN set -eux; \
26+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
27+
mkdir /opt/ibm/wlp/etc/; \
28+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
29+
installUtility install --acceptLicense baseBundle; \
30+
rm /opt/ibm/wlp/etc/repositories.properties; \
31+
elif [ -f /tmp/wlpRepo.zip ]; then \
32+
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
33+
else \
34+
installUtility install --acceptLicense baseBundle; \
35+
fi; \
36+
rm -rf /output/workarea /output/logs; \
37+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
38+
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.10-kernel-java11-openj9-ubi
40+
FROM $PARENT_IMAGE
41+
ARG VERBOSE=false
42+
43+
# Copy the runtime
44+
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
45+
46+
COPY --chown=1001:0 server.xml /config/
47+
48+
# Create a new SCC layer
49+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
50+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
51+
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/25.0.0.10/full/Dockerfile.ubi.openjdk17‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.10-kernel-java17-openj9-ubi
16+
FROM $PARENT_IMAGE AS installBundle
17+
18+
ARG VERBOSE=false
19+
ARG REPOSITORIES_PROPERTIES=""
20+
21+
# If there is a local copy of the repository use that instead
22+
COPY resources/ /tmp/
23+
24+
# Install the base bundle
25+
RUN set -eux; \
26+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
27+
mkdir /opt/ibm/wlp/etc/; \
28+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
29+
installUtility install --acceptLicense baseBundle; \
30+
rm /opt/ibm/wlp/etc/repositories.properties; \
31+
elif [ -f /tmp/wlpRepo.zip ]; then \
32+
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
33+
else \
34+
installUtility install --acceptLicense baseBundle; \
35+
fi; \
36+
rm -rf /output/workarea /output/logs; \
37+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
38+
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.10-kernel-java17-openj9-ubi
40+
FROM $PARENT_IMAGE
41+
ARG VERBOSE=false
42+
43+
# Copy the runtime
44+
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
45+
46+
COPY --chown=1001:0 server.xml /config/
47+
48+
# Create a new SCC layer
49+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
50+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
51+
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

0 commit comments

Comments
 (0)