Skip to content

Commit 897dcfb

Browse files
gkertasefgkertasef
committed
Fixing conflicts
2 parents 15a0db5 + ca51d89 commit 897dcfb

2 files changed

Lines changed: 122 additions & 40 deletions

File tree

‎.secrets.baseline‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
"files": "^.secrets.baseline$",
44
"lines": "fbf6a96d49214c0abc6a3bc5da6e48cd|REPLACE|PWD_TRUST|SECRET|keyStore|secret|rootpwd|dbpassword"
55
},
6+
<<<<<<< HEAD
67
"generated_at": "2025-08-22T19:43:14Z",
8+
=======
9+
"generated_at": "2025-08-13T18:55:02Z",
10+
>>>>>>> main
711
"plugins_used": [
812
{
913
"name": "AWSKeyDetector"
@@ -413,7 +417,11 @@
413417
"verified_result": null
414418
}
415419
],
420+
<<<<<<< HEAD
416421
"ga/25.0.0.9/full/server.xml": [
422+
=======
423+
"ga/25.0.0.8/full/server.xml": [
424+
>>>>>>> main
417425
{
418426
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
419427
"is_secret": false,
@@ -423,7 +431,11 @@
423431
"verified_result": null
424432
}
425433
],
434+
<<<<<<< HEAD
426435
"ga/25.0.0.9/kernel/Dockerfile.ubi.ibmjava8": [
436+
=======
437+
"ga/25.0.0.8/kernel/Dockerfile.ubi.ibmjava8": [
438+
>>>>>>> main
427439
{
428440
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
429441
"is_secret": false,
@@ -433,7 +445,11 @@
433445
"verified_result": null
434446
}
435447
],
448+
<<<<<<< HEAD
436449
"ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk11": [
450+
=======
451+
"ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk11": [
452+
>>>>>>> main
437453
{
438454
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
439455
"is_secret": false,
@@ -443,7 +459,11 @@
443459
"verified_result": null
444460
}
445461
],
462+
<<<<<<< HEAD
446463
"ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk17": [
464+
=======
465+
"ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk17": [
466+
>>>>>>> main
447467
{
448468
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
449469
"is_secret": false,
@@ -453,7 +473,11 @@
453473
"verified_result": null
454474
}
455475
],
476+
<<<<<<< HEAD
456477
"ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8": [
478+
=======
479+
"ga/25.0.0.8/kernel/Dockerfile.ubi.openjdk8": [
480+
>>>>>>> main
457481
{
458482
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
459483
"is_secret": false,
@@ -463,7 +487,11 @@
463487
"verified_result": null
464488
}
465489
],
490+
<<<<<<< HEAD
466491
"ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
492+
=======
493+
"ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
494+
>>>>>>> main
467495
{
468496
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
469497
"is_secret": false,
@@ -473,7 +501,11 @@
473501
"verified_result": null
474502
}
475503
],
504+
<<<<<<< HEAD
476505
"ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk11": [
506+
=======
507+
"ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk11": [
508+
>>>>>>> main
477509
{
478510
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
479511
"is_secret": false,
@@ -483,7 +515,11 @@
483515
"verified_result": null
484516
}
485517
],
518+
<<<<<<< HEAD
486519
"ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk17": [
520+
=======
521+
"ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk17": [
522+
>>>>>>> main
487523
{
488524
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
489525
"is_secret": false,
@@ -493,7 +529,11 @@
493529
"verified_result": null
494530
}
495531
],
532+
<<<<<<< HEAD
496533
"ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk21": [
534+
=======
535+
"ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk21": [
536+
>>>>>>> main
497537
{
498538
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
499539
"is_secret": false,
@@ -503,7 +543,11 @@
503543
"verified_result": null
504544
}
505545
],
546+
<<<<<<< HEAD
506547
"ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8": [
548+
=======
549+
"ga/25.0.0.8/kernel/Dockerfile.ubi9-minimal.openjdk8": [
550+
>>>>>>> main
507551
{
508552
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
509553
"is_secret": false,
@@ -513,7 +557,11 @@
513557
"verified_result": null
514558
}
515559
],
560+
<<<<<<< HEAD
516561
"ga/25.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8": [
562+
=======
563+
"ga/25.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8": [
564+
>>>>>>> main
517565
{
518566
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
519567
"is_secret": false,
@@ -523,7 +571,11 @@
523571
"verified_result": null
524572
}
525573
],
574+
<<<<<<< HEAD
526575
"ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk11": [
576+
=======
577+
"ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk11": [
578+
>>>>>>> main
527579
{
528580
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
529581
"is_secret": false,
@@ -533,7 +585,11 @@
533585
"verified_result": null
534586
}
535587
],
588+
<<<<<<< HEAD
536589
"ga/25.0.0.9/kernel/Dockerfile.ubuntu.openjdk17": [
590+
=======
591+
"ga/25.0.0.8/kernel/Dockerfile.ubuntu.openjdk17": [
592+
>>>>>>> main
537593
{
538594
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
539595
"is_secret": false,
@@ -543,7 +599,11 @@
543599
"verified_result": null
544600
}
545601
],
602+
<<<<<<< HEAD
546603
"ga/25.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml": [
604+
=======
605+
"ga/25.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml": [
606+
>>>>>>> main
547607
{
548608
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
549609
"is_secret": false,
@@ -553,7 +613,11 @@
553613
"verified_result": null
554614
}
555615
],
616+
<<<<<<< HEAD
556617
"ga/25.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml": [
618+
=======
619+
"ga/25.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml": [
620+
>>>>>>> main
557621
{
558622
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
559623
"is_secret": false,
@@ -563,7 +627,11 @@
563627
"verified_result": null
564628
}
565629
],
630+
<<<<<<< HEAD
566631
"ga/25.0.0.9/kernel/helpers/runtime/docker-server.sh": [
632+
=======
633+
"ga/25.0.0.8/kernel/helpers/runtime/docker-server.sh": [
634+
>>>>>>> main
567635
{
568636
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
569637
"is_secret": false,
@@ -573,7 +641,11 @@
573641
"verified_result": null
574642
}
575643
],
644+
<<<<<<< HEAD
576645
"ga/25.0.0.9/oidcProvider/server.xml": [
646+
=======
647+
"ga/25.0.0.8/oidcProvider/server.xml": [
648+
>>>>>>> main
577649
{
578650
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
579651
"is_secret": false,

‎docs/icr-images.md‎

Lines changed: 50 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The `latest` tag simplifies pulling the full latest Open Liberty release with th
1818

1919
Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example,
2020
```
21-
icr.io/appcafe/websphere-liberty:25.0.0.3-kernel-java17-openj9-ubi
21+
icr.io/appcafe/websphere-liberty:25.0.0.9-kernel-java17-openj9-ubi
2222
```
2323

2424
Available images can be listed using [IBM Cloud CLI](https://cloud.ibm.com/docs/cli?topic=cli-getting-started). Log in with your IBMid prior to running the following commands. Note that authentication is only required to list the images. **Images can be pulled from ICR without authentication** :
@@ -30,7 +30,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty
3030

3131
## Latest version
3232

33-
The following tags include the most recent WebSphere Liberty version: `25.0.0.5`
33+
The following tags include the most recent WebSphere Liberty version: `25.0.0.9`
3434

3535
```
3636
kernel-java21-openj9-ubi-minimal
@@ -58,30 +58,56 @@ full-java8-ibmjava-ubi
5858
latest
5959
```
6060

61-
## 25.0.0.5
61+
## 25.0.0.9
6262

6363
```
64-
25.0.0.5-kernel-java21-openj9-ubi-minimal
65-
25.0.0.5-kernel-java17-openj9-ubi-minimal
66-
25.0.0.5-kernel-java11-openj9-ubi-minimal
67-
25.0.0.5-kernel-java8-openj9-ubi-minimal
68-
25.0.0.5-kernel-java8-ibmjava-ubi-minimal
69-
70-
25.0.0.5-kernel-java17-openj9-ubi
71-
25.0.0.5-kernel-java11-openj9-ubi
72-
25.0.0.5-kernel-java8-openj9-ubi
73-
25.0.0.5-kernel-java8-ibmjava-ubi
74-
75-
25.0.0.5-full-java21-openj9-ubi-minimal
76-
25.0.0.5-full-java17-openj9-ubi-minimal
77-
25.0.0.5-full-java11-openj9-ubi-minimal
78-
25.0.0.5-full-java8-openj9-ubi-minimal
79-
25.0.0.5-full-java8-ibmjava-ubi-minimal
80-
81-
25.0.0.5-full-java17-openj9-ubi
82-
25.0.0.5-full-java11-openj9-ubi
83-
25.0.0.5-full-java8-openj9-ubi
84-
25.0.0.5-full-java8-ibmjava-ubi
64+
25.0.0.9-kernel-java21-openj9-ubi-minimal
65+
25.0.0.9-kernel-java17-openj9-ubi-minimal
66+
25.0.0.9-kernel-java11-openj9-ubi-minimal
67+
25.0.0.9-kernel-java8-openj9-ubi-minimal
68+
25.0.0.9-kernel-java8-ibmjava-ubi-minimal
69+
70+
25.0.0.9-kernel-java17-openj9-ubi
71+
25.0.0.9-kernel-java11-openj9-ubi
72+
25.0.0.9-kernel-java8-openj9-ubi
73+
25.0.0.9-kernel-java8-ibmjava-ubi
74+
75+
25.0.0.9-full-java21-openj9-ubi-minimal
76+
25.0.0.9-full-java17-openj9-ubi-minimal
77+
25.0.0.9-full-java11-openj9-ubi-minimal
78+
25.0.0.9-full-java8-openj9-ubi-minimal
79+
25.0.0.9-full-java8-ibmjava-ubi-minimal
80+
81+
25.0.0.9-full-java17-openj9-ubi
82+
25.0.0.9-full-java11-openj9-ubi
83+
25.0.0.9-full-java8-openj9-ubi
84+
25.0.0.9-full-java8-ibmjava-ubi
85+
```
86+
87+
## 25.0.0.6
88+
89+
```
90+
25.0.0.6-kernel-java21-openj9-ubi-minimal
91+
25.0.0.6-kernel-java17-openj9-ubi-minimal
92+
25.0.0.6-kernel-java11-openj9-ubi-minimal
93+
25.0.0.6-kernel-java8-openj9-ubi-minimal
94+
25.0.0.6-kernel-java8-ibmjava-ubi-minimal
95+
96+
25.0.0.6-kernel-java17-openj9-ubi
97+
25.0.0.6-kernel-java11-openj9-ubi
98+
25.0.0.6-kernel-java8-openj9-ubi
99+
25.0.0.6-kernel-java8-ibmjava-ubi
100+
101+
25.0.0.6-full-java21-openj9-ubi-minimal
102+
25.0.0.6-full-java17-openj9-ubi-minimal
103+
25.0.0.6-full-java11-openj9-ubi-minimal
104+
25.0.0.6-full-java8-openj9-ubi-minimal
105+
25.0.0.6-full-java8-ibmjava-ubi-minimal
106+
107+
25.0.0.6-full-java17-openj9-ubi
108+
25.0.0.6-full-java11-openj9-ubi
109+
25.0.0.6-full-java8-openj9-ubi
110+
25.0.0.6-full-java8-ibmjava-ubi
85111
```
86112

87113
## 25.0.0.3
@@ -99,19 +125,3 @@ latest
99125
25.0.0.3-full-java8-openj9-ubi
100126
25.0.0.3-full-java8-ibmjava-ubi
101127
```
102-
103-
## 24.0.0.12
104-
105-
```
106-
24.0.0.12-kernel-java21-openj9-ubi-minimal
107-
24.0.0.12-kernel-java17-openj9-ubi
108-
24.0.0.12-kernel-java11-openj9-ubi
109-
24.0.0.12-kernel-java8-ibmjava-ubi
110-
24.0.0.12-kernel-java8-openj9-ubi
111-
112-
24.0.0.12-full-java21-openj9-ubi-minimal
113-
24.0.0.12-full-java17-openj9-ubi
114-
24.0.0.12-full-java11-openj9-ubi
115-
24.0.0.12-full-java8-openj9-ubi
116-
24.0.0.12-full-java8-ibmjava-ubi
117-
```

0 commit comments

Comments
 (0)