Skip to content

Commit 87f2efc

Browse files
gkertasefgkertasef
authored
Merge pull request #668 from WASdev/vNext
Merge vNext commits into main
2 parents 6664518 + 8b2b9b1 commit 87f2efc

79 files changed

Lines changed: 110 additions & 104 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.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Ignore .DS_Store
22
.DS_Store
3-
#ga/*/*/resources/*
3+
ga/*/*/resources/*

‎.secrets.baseline‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-01-14T17:18:06Z",
6+
"generated_at": "2025-02-11T19:28:37Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -373,7 +373,7 @@
373373
"verified_result": null
374374
}
375375
],
376-
"ga/25.0.0.1/full/server.xml": [
376+
"ga/25.0.0.2/full/server.xml": [
377377
{
378378
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
379379
"is_secret": false,
@@ -383,7 +383,7 @@
383383
"verified_result": null
384384
}
385385
],
386-
"ga/25.0.0.1/kernel/Dockerfile.ubi.ibmjava8": [
386+
"ga/25.0.0.2/kernel/Dockerfile.ubi.ibmjava8": [
387387
{
388388
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
389389
"is_secret": false,
@@ -393,7 +393,7 @@
393393
"verified_result": null
394394
}
395395
],
396-
"ga/25.0.0.1/kernel/Dockerfile.ubi.openjdk11": [
396+
"ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk11": [
397397
{
398398
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
399399
"is_secret": false,
@@ -403,7 +403,7 @@
403403
"verified_result": null
404404
}
405405
],
406-
"ga/25.0.0.1/kernel/Dockerfile.ubi.openjdk17": [
406+
"ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk17": [
407407
{
408408
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
409409
"is_secret": false,
@@ -413,7 +413,7 @@
413413
"verified_result": null
414414
}
415415
],
416-
"ga/25.0.0.1/kernel/Dockerfile.ubi.openjdk21": [
416+
"ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk21": [
417417
{
418418
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
419419
"is_secret": false,
@@ -423,7 +423,7 @@
423423
"verified_result": null
424424
}
425425
],
426-
"ga/25.0.0.1/kernel/Dockerfile.ubi.openjdk8": [
426+
"ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk8": [
427427
{
428428
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
429429
"is_secret": false,
@@ -433,7 +433,7 @@
433433
"verified_result": null
434434
}
435435
],
436-
"ga/25.0.0.1/kernel/Dockerfile.ubuntu.ibmjava8": [
436+
"ga/25.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8": [
437437
{
438438
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
439439
"is_secret": false,
@@ -443,7 +443,7 @@
443443
"verified_result": null
444444
}
445445
],
446-
"ga/25.0.0.1/kernel/Dockerfile.ubuntu.openjdk11": [
446+
"ga/25.0.0.2/kernel/Dockerfile.ubuntu.openjdk11": [
447447
{
448448
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
449449
"is_secret": false,
@@ -453,7 +453,7 @@
453453
"verified_result": null
454454
}
455455
],
456-
"ga/25.0.0.1/kernel/Dockerfile.ubuntu.openjdk17": [
456+
"ga/25.0.0.2/kernel/Dockerfile.ubuntu.openjdk17": [
457457
{
458458
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
459459
"is_secret": false,
@@ -463,7 +463,7 @@
463463
"verified_result": null
464464
}
465465
],
466-
"ga/25.0.0.1/kernel/helpers/build/configuration_snippets/keystore.xml": [
466+
"ga/25.0.0.2/kernel/helpers/build/configuration_snippets/keystore.xml": [
467467
{
468468
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
469469
"is_secret": false,
@@ -473,7 +473,7 @@
473473
"verified_result": null
474474
}
475475
],
476-
"ga/25.0.0.1/kernel/helpers/build/configuration_snippets/truststore.xml": [
476+
"ga/25.0.0.2/kernel/helpers/build/configuration_snippets/truststore.xml": [
477477
{
478478
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
479479
"is_secret": false,
@@ -483,7 +483,7 @@
483483
"verified_result": null
484484
}
485485
],
486-
"ga/25.0.0.1/kernel/helpers/runtime/docker-server.sh": [
486+
"ga/25.0.0.2/kernel/helpers/runtime/docker-server.sh": [
487487
{
488488
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
489489
"is_secret": false,
@@ -493,7 +493,7 @@
493493
"verified_result": null
494494
}
495495
],
496-
"ga/25.0.0.1/oidcProvider/server.xml": [
496+
"ga/25.0.0.2/oidcProvider/server.xml": [
497497
{
498498
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
499499
"is_secret": false,

‎ga/25.0.0.1/images.txt‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ga/25.0.0.2/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.1/full/Dockerfile.ubi.ibmjava8 renamed to ga/25.0.0.2/full/Dockerfile.ubi.ibmjava8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java8-ibmjava-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java8-ibmjava-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java8-ibmjava-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java8-ibmjava-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.1/full/Dockerfile.ubi.openjdk11 renamed to ga/25.0.0.2/full/Dockerfile.ubi.openjdk11

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java11-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java11-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java11-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java11-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.1/full/Dockerfile.ubi.openjdk17 renamed to ga/25.0.0.2/full/Dockerfile.ubi.openjdk17

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java17-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java17-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java17-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java17-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.1/full/Dockerfile.ubi.openjdk21 renamed to ga/25.0.0.2/full/Dockerfile.ubi.openjdk21

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java21-openj9-ubi9-minimal
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java21-openj9-ubi9-minimal
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java21-openj9-ubi9-minimal
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java21-openj9-ubi9-minimal
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.1/full/Dockerfile.ubi.openjdk8 renamed to ga/25.0.0.2/full/Dockerfile.ubi.openjdk8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java8-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java8-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.1-kernel-java8-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java8-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.1/full/Dockerfile.ubuntu.ibmjava8 renamed to ga/25.0.0.2/full/Dockerfile.ubuntu.ibmjava8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM websphere-liberty:25.0.0.1-kernel-java8-ibmjava
15+
FROM websphere-liberty:25.0.0.2-kernel-java8-ibmjava
1616

1717
ARG VERBOSE=false
1818
ARG REPOSITORIES_PROPERTIES=""

0 commit comments

Comments
 (0)