Skip to content

Commit 81b52e4

Browse files
wraschkewraschke
authored
Merge pull request #740 from WASdev/release-26.0.0.1
Release 26.0.0.1 updates
2 parents dd69902 + e0dbc20 commit 81b52e4

File tree

95 files changed

+4950
-50
lines changed

Some content is hidden

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

95 files changed

+4950
-50
lines changed

‎.secrets.baseline‎

Lines changed: 189 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-11-19T22:22:21Z",
6+
"generated_at": "2026-01-13T16:25:23Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -641,6 +641,194 @@
641641
"verified_result": null
642642
}
643643
],
644+
"ga/26.0.0.1/full/server.xml": [
645+
{
646+
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
647+
"is_secret": false,
648+
"is_verified": false,
649+
"line_number": 16,
650+
"type": "Secret Keyword",
651+
"verified_result": null
652+
}
653+
],
654+
"ga/26.0.0.1/kernel/Dockerfile.ubi.ibmjava8": [
655+
{
656+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
657+
"is_secret": false,
658+
"is_verified": false,
659+
"line_number": 73,
660+
"type": "Hex High Entropy String",
661+
"verified_result": null
662+
}
663+
],
664+
"ga/26.0.0.1/kernel/Dockerfile.ubi.openjdk11": [
665+
{
666+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
667+
"is_secret": false,
668+
"is_verified": false,
669+
"line_number": 74,
670+
"type": "Hex High Entropy String",
671+
"verified_result": null
672+
}
673+
],
674+
"ga/26.0.0.1/kernel/Dockerfile.ubi.openjdk17": [
675+
{
676+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
677+
"is_secret": false,
678+
"is_verified": false,
679+
"line_number": 73,
680+
"type": "Hex High Entropy String",
681+
"verified_result": null
682+
}
683+
],
684+
"ga/26.0.0.1/kernel/Dockerfile.ubi.openjdk8": [
685+
{
686+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
687+
"is_secret": false,
688+
"is_verified": false,
689+
"line_number": 73,
690+
"type": "Hex High Entropy String",
691+
"verified_result": null
692+
}
693+
],
694+
"ga/26.0.0.1/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
695+
{
696+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
697+
"is_secret": false,
698+
"is_verified": false,
699+
"line_number": 84,
700+
"type": "Hex High Entropy String",
701+
"verified_result": null
702+
}
703+
],
704+
"ga/26.0.0.1/kernel/Dockerfile.ubi9-minimal.openjdk11": [
705+
{
706+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
707+
"is_secret": false,
708+
"is_verified": false,
709+
"line_number": 72,
710+
"type": "Hex High Entropy String",
711+
"verified_result": null
712+
}
713+
],
714+
"ga/26.0.0.1/kernel/Dockerfile.ubi9-minimal.openjdk17": [
715+
{
716+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
717+
"is_secret": false,
718+
"is_verified": false,
719+
"line_number": 72,
720+
"type": "Hex High Entropy String",
721+
"verified_result": null
722+
}
723+
],
724+
"ga/26.0.0.1/kernel/Dockerfile.ubi9-minimal.openjdk21": [
725+
{
726+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
727+
"is_secret": false,
728+
"is_verified": false,
729+
"line_number": 72,
730+
"type": "Hex High Entropy String",
731+
"verified_result": null
732+
}
733+
],
734+
"ga/26.0.0.1/kernel/Dockerfile.ubi9-minimal.openjdk25": [
735+
{
736+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
737+
"is_secret": false,
738+
"is_verified": false,
739+
"line_number": 72,
740+
"type": "Hex High Entropy String",
741+
"verified_result": null
742+
}
743+
],
744+
"ga/26.0.0.1/kernel/Dockerfile.ubi9-minimal.openjdk8": [
745+
{
746+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
747+
"is_secret": false,
748+
"is_verified": false,
749+
"line_number": 72,
750+
"type": "Hex High Entropy String",
751+
"verified_result": null
752+
}
753+
],
754+
"ga/26.0.0.1/kernel/Dockerfile.ubuntu.ibmjava8": [
755+
{
756+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
757+
"is_secret": false,
758+
"is_verified": false,
759+
"line_number": 40,
760+
"type": "Hex High Entropy String",
761+
"verified_result": null
762+
}
763+
],
764+
"ga/26.0.0.1/kernel/Dockerfile.ubuntu.openjdk11": [
765+
{
766+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
767+
"is_secret": false,
768+
"is_verified": false,
769+
"line_number": 40,
770+
"type": "Hex High Entropy String",
771+
"verified_result": null
772+
}
773+
],
774+
"ga/26.0.0.1/kernel/Dockerfile.ubuntu.openjdk17": [
775+
{
776+
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
777+
"is_secret": false,
778+
"is_verified": false,
779+
"line_number": 40,
780+
"type": "Hex High Entropy String",
781+
"verified_result": null
782+
}
783+
],
784+
"ga/26.0.0.1/kernel/helpers/build/configuration_snippets/keystore.xml": [
785+
{
786+
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
787+
"is_secret": false,
788+
"is_verified": false,
789+
"line_number": 2,
790+
"type": "Secret Keyword",
791+
"verified_result": null
792+
}
793+
],
794+
"ga/26.0.0.1/kernel/helpers/build/configuration_snippets/truststore.xml": [
795+
{
796+
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
797+
"is_secret": false,
798+
"is_verified": false,
799+
"line_number": 3,
800+
"type": "Secret Keyword",
801+
"verified_result": null
802+
}
803+
],
804+
"ga/26.0.0.1/kernel/helpers/runtime/docker-server.sh": [
805+
{
806+
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
807+
"is_secret": false,
808+
"is_verified": false,
809+
"line_number": 141,
810+
"type": "Secret Keyword",
811+
"verified_result": null
812+
}
813+
],
814+
"ga/26.0.0.1/oidcProvider/server.xml": [
815+
{
816+
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
817+
"is_secret": false,
818+
"is_verified": false,
819+
"line_number": 42,
820+
"type": "Secret Keyword",
821+
"verified_result": null
822+
},
823+
{
824+
"hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0",
825+
"is_secret": false,
826+
"is_verified": false,
827+
"line_number": 133,
828+
"type": "Secret Keyword",
829+
"verified_result": null
830+
}
831+
],
644832
"ga/latest/full/server.xml": [
645833
{
646834
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",

‎ga/26.0.0.1/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/26.0.0.1/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:26.0.0.1-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:26.0.0.1-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/26.0.0.1/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:26.0.0.1-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:26.0.0.1-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/26.0.0.1/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:26.0.0.1-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:26.0.0.1-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)