Skip to content

Commit c4051f2

Browse files
leochrleochr
authored
Merge pull request #703 from WASdev/vNext
Merge vNext commits to main
2 parents ea0c121 + 0847dcf commit c4051f2

92 files changed

Lines changed: 4649 additions & 46 deletions

File tree

Some content is hidden

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

‎.secrets.baseline‎

Lines changed: 179 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-06-03T18:12:06Z",
6+
"generated_at": "2025-07-01T20:11:15Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -413,6 +413,184 @@
413413
"verified_result": null
414414
}
415415
],
416+
"ga/25.0.0.7/full/server.xml": [
417+
{
418+
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
419+
"is_secret": false,
420+
"is_verified": false,
421+
"line_number": 16,
422+
"type": "Secret Keyword",
423+
"verified_result": null
424+
}
425+
],
426+
"ga/25.0.0.7/kernel/Dockerfile.ubi.ibmjava8": [
427+
{
428+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
429+
"is_secret": false,
430+
"is_verified": false,
431+
"line_number": 73,
432+
"type": "Hex High Entropy String",
433+
"verified_result": null
434+
}
435+
],
436+
"ga/25.0.0.7/kernel/Dockerfile.ubi.openjdk11": [
437+
{
438+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
439+
"is_secret": false,
440+
"is_verified": false,
441+
"line_number": 74,
442+
"type": "Hex High Entropy String",
443+
"verified_result": null
444+
}
445+
],
446+
"ga/25.0.0.7/kernel/Dockerfile.ubi.openjdk17": [
447+
{
448+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
449+
"is_secret": false,
450+
"is_verified": false,
451+
"line_number": 73,
452+
"type": "Hex High Entropy String",
453+
"verified_result": null
454+
}
455+
],
456+
"ga/25.0.0.7/kernel/Dockerfile.ubi.openjdk8": [
457+
{
458+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
459+
"is_secret": false,
460+
"is_verified": false,
461+
"line_number": 73,
462+
"type": "Hex High Entropy String",
463+
"verified_result": null
464+
}
465+
],
466+
"ga/25.0.0.7/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
467+
{
468+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
469+
"is_secret": false,
470+
"is_verified": false,
471+
"line_number": 84,
472+
"type": "Hex High Entropy String",
473+
"verified_result": null
474+
}
475+
],
476+
"ga/25.0.0.7/kernel/Dockerfile.ubi9-minimal.openjdk11": [
477+
{
478+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
479+
"is_secret": false,
480+
"is_verified": false,
481+
"line_number": 72,
482+
"type": "Hex High Entropy String",
483+
"verified_result": null
484+
}
485+
],
486+
"ga/25.0.0.7/kernel/Dockerfile.ubi9-minimal.openjdk17": [
487+
{
488+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
489+
"is_secret": false,
490+
"is_verified": false,
491+
"line_number": 72,
492+
"type": "Hex High Entropy String",
493+
"verified_result": null
494+
}
495+
],
496+
"ga/25.0.0.7/kernel/Dockerfile.ubi9-minimal.openjdk21": [
497+
{
498+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
499+
"is_secret": false,
500+
"is_verified": false,
501+
"line_number": 72,
502+
"type": "Hex High Entropy String",
503+
"verified_result": null
504+
}
505+
],
506+
"ga/25.0.0.7/kernel/Dockerfile.ubi9-minimal.openjdk8": [
507+
{
508+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
509+
"is_secret": false,
510+
"is_verified": false,
511+
"line_number": 72,
512+
"type": "Hex High Entropy String",
513+
"verified_result": null
514+
}
515+
],
516+
"ga/25.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8": [
517+
{
518+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
519+
"is_secret": false,
520+
"is_verified": false,
521+
"line_number": 40,
522+
"type": "Hex High Entropy String",
523+
"verified_result": null
524+
}
525+
],
526+
"ga/25.0.0.7/kernel/Dockerfile.ubuntu.openjdk11": [
527+
{
528+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
529+
"is_secret": false,
530+
"is_verified": false,
531+
"line_number": 40,
532+
"type": "Hex High Entropy String",
533+
"verified_result": null
534+
}
535+
],
536+
"ga/25.0.0.7/kernel/Dockerfile.ubuntu.openjdk17": [
537+
{
538+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
539+
"is_secret": false,
540+
"is_verified": false,
541+
"line_number": 40,
542+
"type": "Hex High Entropy String",
543+
"verified_result": null
544+
}
545+
],
546+
"ga/25.0.0.7/kernel/helpers/build/configuration_snippets/keystore.xml": [
547+
{
548+
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
549+
"is_secret": false,
550+
"is_verified": false,
551+
"line_number": 2,
552+
"type": "Secret Keyword",
553+
"verified_result": null
554+
}
555+
],
556+
"ga/25.0.0.7/kernel/helpers/build/configuration_snippets/truststore.xml": [
557+
{
558+
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
559+
"is_secret": false,
560+
"is_verified": false,
561+
"line_number": 3,
562+
"type": "Secret Keyword",
563+
"verified_result": null
564+
}
565+
],
566+
"ga/25.0.0.7/kernel/helpers/runtime/docker-server.sh": [
567+
{
568+
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
569+
"is_secret": false,
570+
"is_verified": false,
571+
"line_number": 141,
572+
"type": "Secret Keyword",
573+
"verified_result": null
574+
}
575+
],
576+
"ga/25.0.0.7/oidcProvider/server.xml": [
577+
{
578+
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
579+
"is_secret": false,
580+
"is_verified": false,
581+
"line_number": 42,
582+
"type": "Secret Keyword",
583+
"verified_result": null
584+
},
585+
{
586+
"hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0",
587+
"is_secret": false,
588+
"is_verified": false,
589+
"line_number": 133,
590+
"type": "Secret Keyword",
591+
"verified_result": null
592+
}
593+
],
416594
"ga/latest/full/server.xml": [
417595
{
418596
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",

‎ga/25.0.0.7/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.7/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.7-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.7-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.7/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.7-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.7-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.7/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.7-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.7-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)