From 4ac4a82b2af775e8c542fe2e15b8d87432ae98f7 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Thu, 25 Apr 2024 10:45:02 -0400 Subject: [PATCH 01/12] List images for 24.0.0.4 (#608) --- docs/icr-images.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index d0b933ecf..66e622829 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -28,7 +28,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ``` -## Latest version (24.0.0.3) +## Latest version (24.0.0.4) ``` kernel-java21-openj9-ubi-minimal @@ -46,6 +46,22 @@ full-java8-ibmjava-ubi latest ``` +## 24.0.0.4 + +``` +24.0.0.4-kernel-java21-openj9-ubi-minimal +24.0.0.4-kernel-java17-openj9-ubi +24.0.0.4-kernel-java11-openj9-ubi +24.0.0.4-kernel-java8-ibmjava-ubi +24.0.0.4-kernel-java8-openj9-ubi + +24.0.0.4-full-java21-openj9-ubi-minimal +24.0.0.4-full-java17-openj9-ubi +24.0.0.4-full-java11-openj9-ubi +24.0.0.4-full-java8-openj9-ubi +24.0.0.4-full-java8-ibmjava-ubi +``` + ## 24.0.0.3 ``` From 9c6413c8f3a5409b454916ce77d17fa736920438 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Wed, 22 May 2024 09:50:58 -0400 Subject: [PATCH 02/12] List images for 24.0.0.5 (#614) --- docs/icr-images.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index 66e622829..f1935330d 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -28,7 +28,9 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ``` -## Latest version (24.0.0.4) +## Latest version + +The following tags include the most recent WebSphere Liberty version: `24.0.0.5` ``` kernel-java21-openj9-ubi-minimal @@ -46,20 +48,20 @@ full-java8-ibmjava-ubi latest ``` -## 24.0.0.4 +## 24.0.0.5 ``` -24.0.0.4-kernel-java21-openj9-ubi-minimal -24.0.0.4-kernel-java17-openj9-ubi -24.0.0.4-kernel-java11-openj9-ubi -24.0.0.4-kernel-java8-ibmjava-ubi -24.0.0.4-kernel-java8-openj9-ubi - -24.0.0.4-full-java21-openj9-ubi-minimal -24.0.0.4-full-java17-openj9-ubi -24.0.0.4-full-java11-openj9-ubi -24.0.0.4-full-java8-openj9-ubi -24.0.0.4-full-java8-ibmjava-ubi +24.0.0.5-kernel-java21-openj9-ubi-minimal +24.0.0.5-kernel-java17-openj9-ubi +24.0.0.5-kernel-java11-openj9-ubi +24.0.0.5-kernel-java8-ibmjava-ubi +24.0.0.5-kernel-java8-openj9-ubi + +24.0.0.5-full-java21-openj9-ubi-minimal +24.0.0.5-full-java17-openj9-ubi +24.0.0.5-full-java11-openj9-ubi +24.0.0.5-full-java8-openj9-ubi +24.0.0.5-full-java8-ibmjava-ubi ``` ## 24.0.0.3 From ff9dbfa053bb219fe68cf4abbd754d4a2583ca92 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Tue, 18 Jun 2024 17:56:23 -0400 Subject: [PATCH 03/12] List images for 24.0.0.6 (#621) --- docs/icr-images.md | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index f1935330d..061ffbda4 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -18,7 +18,7 @@ The `latest` tag simplifies pulling the full latest Open Liberty release with th Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example, ``` -icr.io/appcafe/websphere-liberty:24.0.0.3-kernel-java17-openj9-ubi +icr.io/appcafe/websphere-liberty:24.0.0.6-kernel-java17-openj9-ubi ``` 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 ## Latest version -The following tags include the most recent WebSphere Liberty version: `24.0.0.5` +The following tags include the most recent WebSphere Liberty version: `24.0.0.6` ``` kernel-java21-openj9-ubi-minimal @@ -48,20 +48,20 @@ full-java8-ibmjava-ubi latest ``` -## 24.0.0.5 +## 24.0.0.6 ``` -24.0.0.5-kernel-java21-openj9-ubi-minimal -24.0.0.5-kernel-java17-openj9-ubi -24.0.0.5-kernel-java11-openj9-ubi -24.0.0.5-kernel-java8-ibmjava-ubi -24.0.0.5-kernel-java8-openj9-ubi - -24.0.0.5-full-java21-openj9-ubi-minimal -24.0.0.5-full-java17-openj9-ubi -24.0.0.5-full-java11-openj9-ubi -24.0.0.5-full-java8-openj9-ubi -24.0.0.5-full-java8-ibmjava-ubi +24.0.0.6-kernel-java21-openj9-ubi-minimal +24.0.0.6-kernel-java17-openj9-ubi +24.0.0.6-kernel-java11-openj9-ubi +24.0.0.6-kernel-java8-ibmjava-ubi +24.0.0.6-kernel-java8-openj9-ubi + +24.0.0.6-full-java21-openj9-ubi-minimal +24.0.0.6-full-java17-openj9-ubi +24.0.0.6-full-java11-openj9-ubi +24.0.0.6-full-java8-openj9-ubi +24.0.0.6-full-java8-ibmjava-ubi ``` ## 24.0.0.3 @@ -79,17 +79,3 @@ latest 24.0.0.3-full-java8-openj9-ubi 24.0.0.3-full-java8-ibmjava-ubi ``` - -## 23.0.0.12 - -``` -23.0.0.12-kernel-java17-openj9-ubi -23.0.0.12-kernel-java11-openj9-ubi -23.0.0.12-kernel-java8-openj9-ubi -23.0.0.12-kernel-java8-ibmjava-ubi - -23.0.0.12-full-java17-openj9-ubi -23.0.0.12-full-java11-openj9-ubi -23.0.0.12-full-java8-openj9-ubi -23.0.0.12-full-java8-ibmjava-ubi -``` From a664a745d16d1a9717d1cc674576ebcec9d58c73 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Tue, 16 Jul 2024 17:34:02 -0400 Subject: [PATCH 04/12] List images for 24.0.0.7 --- docs/icr-images.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index 061ffbda4..818aea1aa 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -30,7 +30,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ## Latest version -The following tags include the most recent WebSphere Liberty version: `24.0.0.6` +The following tags include the most recent WebSphere Liberty version: `24.0.0.7` ``` kernel-java21-openj9-ubi-minimal @@ -48,6 +48,22 @@ full-java8-ibmjava-ubi latest ``` +## 24.0.0.7 + +``` +24.0.0.7-kernel-java21-openj9-ubi-minimal +24.0.0.7-kernel-java17-openj9-ubi +24.0.0.7-kernel-java11-openj9-ubi +24.0.0.7-kernel-java8-ibmjava-ubi +24.0.0.7-kernel-java8-openj9-ubi + +24.0.0.7-full-java21-openj9-ubi-minimal +24.0.0.7-full-java17-openj9-ubi +24.0.0.7-full-java11-openj9-ubi +24.0.0.7-full-java8-openj9-ubi +24.0.0.7-full-java8-ibmjava-ubi +``` + ## 24.0.0.6 ``` From c9a59e87120d879482f73e8e82424ad020c7572e Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Mon, 22 Jul 2024 10:41:25 -0400 Subject: [PATCH 05/12] Document SKIP_FEATURE_INSTALL option (#628) * Document SKIP_FEATURE_INSTALL option Signed-off-by: Leo Christy Jesuraj * List the options alphabetically Signed-off-by: Leo Christy Jesuraj --------- Signed-off-by: Leo Christy Jesuraj --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8c8181003..4776c9015 100644 --- a/README.md +++ b/README.md @@ -69,14 +69,16 @@ Refer to [Repository and proxy modifications](https://openliberty.io/docs/ref/co ## Optional Enterprise Functionality -This section describes the optional enterprise functionality that can be enabled via the Dockerfile during `build` time, by setting particular argument (`ARG`) or environment variable (`ENV`) and calling `RUN configure.sh`. Each of these options trigger the inclusion of specific configuration via XML snippets (except for `VERBOSE`), described below: +This section describes the optional enterprise functionality that can be enabled via the Dockerfile during `build` time, by setting particular argument (`ARG`) or environment variable (`ENV`) and calling `RUN configure.sh`. Each of these options trigger the inclusion of specific configuration via XML snippets (except for `VERBOSE` and `SKIP_FEATURE_INSTALL`), described below: -* `TLS` (`SSL` is deprecated) - * Description: Enable Transport Security in Liberty by adding the `transportSecurity-1.0` feature (includes support for SSL). - * XML Snippet Location: [keystore.xml](ga/latest/kernel/helpers/build/configuration_snippets/keystore.xml). * `HZ_SESSION_CACHE` * Description: Enable the persistence of HTTP sessions using JCache by adding the `sessionCache-1.0` feature. * XML Snippet Location: [hazelcast-sessioncache.xml](ga/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml) +* `SKIP_FEATURE_INSTALL` + * Description: Default setting is `false`. When set to `true`, Liberty features will not be installed using `installUtility` when `configure.sh` is run. This setting is not applicable when `features.sh` is run. +* `TLS` (`SSL` is deprecated) + * Description: Enable Transport Security in Liberty by adding the `transportSecurity-1.0` feature (includes support for SSL). + * XML Snippet Location: [keystore.xml](ga/latest/kernel/helpers/build/configuration_snippets/keystore.xml). * `VERBOSE` * Description: When set to `true` it outputs the commands and results to stdout from `configure.sh`. Otherwise, default setting is `false` and `configure.sh` is silenced. From c4fb6218cf68785bbf725d65cf9754fc2164699b Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Wed, 14 Aug 2024 14:25:04 -0400 Subject: [PATCH 06/12] List images for 24.0.0.8 --- docs/icr-images.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index 818aea1aa..eddb69c1e 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -30,7 +30,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ## Latest version -The following tags include the most recent WebSphere Liberty version: `24.0.0.7` +The following tags include the most recent WebSphere Liberty version: `24.0.0.8` ``` kernel-java21-openj9-ubi-minimal @@ -48,20 +48,20 @@ full-java8-ibmjava-ubi latest ``` -## 24.0.0.7 +## 24.0.0.8 ``` -24.0.0.7-kernel-java21-openj9-ubi-minimal -24.0.0.7-kernel-java17-openj9-ubi -24.0.0.7-kernel-java11-openj9-ubi -24.0.0.7-kernel-java8-ibmjava-ubi -24.0.0.7-kernel-java8-openj9-ubi - -24.0.0.7-full-java21-openj9-ubi-minimal -24.0.0.7-full-java17-openj9-ubi -24.0.0.7-full-java11-openj9-ubi -24.0.0.7-full-java8-openj9-ubi -24.0.0.7-full-java8-ibmjava-ubi +24.0.0.8-kernel-java21-openj9-ubi-minimal +24.0.0.8-kernel-java17-openj9-ubi +24.0.0.8-kernel-java11-openj9-ubi +24.0.0.8-kernel-java8-ibmjava-ubi +24.0.0.8-kernel-java8-openj9-ubi + +24.0.0.8-full-java21-openj9-ubi-minimal +24.0.0.8-full-java17-openj9-ubi +24.0.0.8-full-java11-openj9-ubi +24.0.0.8-full-java8-openj9-ubi +24.0.0.8-full-java8-ibmjava-ubi ``` ## 24.0.0.6 From 9f139d1698f7dafa00d8cd51884a21454dee94d6 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Tue, 10 Sep 2024 17:26:15 -0400 Subject: [PATCH 07/12] List images for 24.0.0.9 (#636) --- docs/icr-images.md | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index eddb69c1e..7179d8dc2 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -18,7 +18,7 @@ The `latest` tag simplifies pulling the full latest Open Liberty release with th Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example, ``` -icr.io/appcafe/websphere-liberty:24.0.0.6-kernel-java17-openj9-ubi +icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi ``` 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 ## Latest version -The following tags include the most recent WebSphere Liberty version: `24.0.0.8` +The following tags include the most recent WebSphere Liberty version: `24.0.0.9` ``` kernel-java21-openj9-ubi-minimal @@ -48,20 +48,20 @@ full-java8-ibmjava-ubi latest ``` -## 24.0.0.8 +## 24.0.0.9 ``` -24.0.0.8-kernel-java21-openj9-ubi-minimal -24.0.0.8-kernel-java17-openj9-ubi -24.0.0.8-kernel-java11-openj9-ubi -24.0.0.8-kernel-java8-ibmjava-ubi -24.0.0.8-kernel-java8-openj9-ubi - -24.0.0.8-full-java21-openj9-ubi-minimal -24.0.0.8-full-java17-openj9-ubi -24.0.0.8-full-java11-openj9-ubi -24.0.0.8-full-java8-openj9-ubi -24.0.0.8-full-java8-ibmjava-ubi +24.0.0.9-kernel-java21-openj9-ubi-minimal +24.0.0.9-kernel-java17-openj9-ubi +24.0.0.9-kernel-java11-openj9-ubi +24.0.0.9-kernel-java8-ibmjava-ubi +24.0.0.9-kernel-java8-openj9-ubi + +24.0.0.9-full-java21-openj9-ubi-minimal +24.0.0.9-full-java17-openj9-ubi +24.0.0.9-full-java11-openj9-ubi +24.0.0.9-full-java8-openj9-ubi +24.0.0.9-full-java8-ibmjava-ubi ``` ## 24.0.0.6 @@ -79,19 +79,3 @@ latest 24.0.0.6-full-java8-openj9-ubi 24.0.0.6-full-java8-ibmjava-ubi ``` - -## 24.0.0.3 - -``` -24.0.0.3-kernel-java21-openj9-ubi-minimal -24.0.0.3-kernel-java17-openj9-ubi -24.0.0.3-kernel-java11-openj9-ubi -24.0.0.3-kernel-java8-ibmjava-ubi -24.0.0.3-kernel-java8-openj9-ubi - -24.0.0.3-full-java21-openj9-ubi-minimal -24.0.0.3-full-java17-openj9-ubi -24.0.0.3-full-java11-openj9-ubi -24.0.0.3-full-java8-openj9-ubi -24.0.0.3-full-java8-ibmjava-ubi -``` From 97a9122ba568b42b49a06c3c339e1219b7b819b3 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Wed, 9 Oct 2024 09:16:07 -0400 Subject: [PATCH 08/12] List images for 24.0.0.10 (#641) --- docs/icr-images.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index 7179d8dc2..23ae0e762 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -30,7 +30,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ## Latest version -The following tags include the most recent WebSphere Liberty version: `24.0.0.9` +The following tags include the most recent WebSphere Liberty version: `24.0.0.10` ``` kernel-java21-openj9-ubi-minimal @@ -48,6 +48,22 @@ full-java8-ibmjava-ubi latest ``` +## 24.0.0.10 + +``` +24.0.0.10-kernel-java21-openj9-ubi-minimal +24.0.0.10-kernel-java17-openj9-ubi +24.0.0.10-kernel-java11-openj9-ubi +24.0.0.10-kernel-java8-ibmjava-ubi +24.0.0.10-kernel-java8-openj9-ubi + +24.0.0.10-full-java21-openj9-ubi-minimal +24.0.0.10-full-java17-openj9-ubi +24.0.0.10-full-java11-openj9-ubi +24.0.0.10-full-java8-openj9-ubi +24.0.0.10-full-java8-ibmjava-ubi +``` + ## 24.0.0.9 ``` From 1760b11cc671c85258ebb420471c01834b46b29c Mon Sep 17 00:00:00 2001 From: Gkerta Seferi Date: Thu, 17 Oct 2024 11:54:36 +0100 Subject: [PATCH 09/12] Adding detect secrets files --- .pre-commit-config.yaml | 21 ++ .secrets.baseline | 778 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 799 insertions(+) create mode 100644 .pre-commit-config.yaml create mode 100644 .secrets.baseline diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000..dcede9b96 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,21 @@ +# This is an example configuration to enable detect-secrets in the pre-commit hook. +# Add this file to the root folder of your repository. +# +# Read pre-commit hook framework https://pre-commit.com/ for more details about the structure of config yaml file and how git pre-commit would invoke each hook. +# +# This line indicates we will use the hook from ibm/detect-secrets to run scan during committing phase. +repos: + - repo: https://github.com/ibm/detect-secrets + # If you desire to use a specific version of detect-secrets, you can replace `master` with other git revisions such as branch, tag or commit sha. + # You are encouraged to use static refs such as tags, instead of branch name + # + # Running "pre-commit autoupdate" automatically updates rev to latest tag + rev: 0.13.1+ibm.62.dss + hooks: + - id: detect-secrets # pragma: whitelist secret + # Add options for detect-secrets-hook binary. You can run `detect-secrets-hook --help` to list out all possible options. + # You may also run `pre-commit run detect-secrets` to preview the scan result. + # when "--baseline" without "--use-all-plugins", pre-commit scan with just plugins in baseline file + # when "--baseline" with "--use-all-plugins", pre-commit scan with all available plugins + # add "--fail-on-unaudited" to fail pre-commit for unaudited potential secrets + args: [--baseline, .secrets.baseline, --use-all-plugins] \ No newline at end of file diff --git a/.secrets.baseline b/.secrets.baseline new file mode 100644 index 000000000..820a0ef2a --- /dev/null +++ b/.secrets.baseline @@ -0,0 +1,778 @@ +{ + "exclude": { + "files": "^.secrets.baseline$", + "lines": null + }, + "generated_at": "2024-10-17T10:46:47Z", + "plugins_used": [ + { + "name": "AWSKeyDetector" + }, + { + "name": "ArtifactoryDetector" + }, + { + "name": "AzureStorageKeyDetector" + }, + { + "base64_limit": 4.5, + "name": "Base64HighEntropyString" + }, + { + "name": "BasicAuthDetector" + }, + { + "name": "BoxDetector" + }, + { + "name": "CloudantDetector" + }, + { + "ghe_instance": "github.ibm.com", + "name": "GheDetector" + }, + { + "name": "GitHubTokenDetector" + }, + { + "hex_limit": 3, + "name": "HexHighEntropyString" + }, + { + "name": "IbmCloudIamDetector" + }, + { + "name": "IbmCosHmacDetector" + }, + { + "name": "JwtTokenDetector" + }, + { + "keyword_exclude": null, + "name": "KeywordDetector" + }, + { + "name": "MailchimpDetector" + }, + { + "name": "NpmDetector" + }, + { + "name": "PrivateKeyDetector" + }, + { + "name": "SlackDetector" + }, + { + "name": "SoftlayerDetector" + }, + { + "name": "SquareOAuthDetector" + }, + { + "name": "StripeDetector" + }, + { + "name": "TwilioKeyDetector" + } + ], + "results": { + "README.md": [ + { + "hashed_secret": "d35c3962aea67dd81e53f6d48ca0473954b2f7f8", + "is_secret": false, + "is_verified": false, + "line_number": 65, + "type": "Secret Keyword", + "verified_result": null + } + ], + "beta/server.xml": [ + { + "hashed_secret": "abd663767ae6badd02573a5fa1ae43bfe2c03c7e", + "is_secret": false, + "is_verified": false, + "line_number": 13, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.10/full/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 16, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 70, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml": [ + { + "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", + "is_secret": false, + "is_verified": false, + "line_number": 2, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml": [ + { + "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", + "is_secret": false, + "is_verified": false, + "line_number": 3, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.10/kernel/helpers/runtime/docker-server.sh": [ + { + "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", + "is_secret": false, + "is_verified": false, + "line_number": 138, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.10/oidcProvider/server.xml": [ + { + "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0", + "is_secret": false, + "is_verified": false, + "line_number": 133, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.6/full/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 16, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/Dockerfile.ubi.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk21": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 70, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/Dockerfile.ubuntu.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/Dockerfile.ubuntu.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml": [ + { + "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", + "is_secret": false, + "is_verified": false, + "line_number": 2, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml": [ + { + "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", + "is_secret": false, + "is_verified": false, + "line_number": 3, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.6/kernel/helpers/runtime/docker-server.sh": [ + { + "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", + "is_secret": false, + "is_verified": false, + "line_number": 138, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.6/oidcProvider/server.xml": [ + { + "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0", + "is_secret": false, + "is_verified": false, + "line_number": 133, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.9/full/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 16, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 70, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml": [ + { + "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", + "is_secret": false, + "is_verified": false, + "line_number": 2, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml": [ + { + "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", + "is_secret": false, + "is_verified": false, + "line_number": 3, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.9/kernel/helpers/runtime/docker-server.sh": [ + { + "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", + "is_secret": false, + "is_verified": false, + "line_number": 138, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/24.0.0.9/oidcProvider/server.xml": [ + { + "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0", + "is_secret": false, + "is_verified": false, + "line_number": 133, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/full/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 16, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 72, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.openjdk21": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 70, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubi.openjdk8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 71, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubuntu.ibmjava8": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubuntu.openjdk11": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/Dockerfile.ubuntu.openjdk17": [ + { + "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", + "is_secret": false, + "is_verified": false, + "line_number": 38, + "type": "Hex High Entropy String", + "verified_result": null + } + ], + "ga/latest/kernel/helpers/build/configuration_snippets/keystore.xml": [ + { + "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", + "is_secret": false, + "is_verified": false, + "line_number": 2, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/kernel/helpers/build/configuration_snippets/truststore.xml": [ + { + "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", + "is_secret": false, + "is_verified": false, + "line_number": 3, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/kernel/helpers/runtime/docker-server.sh": [ + { + "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", + "is_secret": false, + "is_verified": false, + "line_number": 138, + "type": "Secret Keyword", + "verified_result": null + } + ], + "ga/latest/oidcProvider/server.xml": [ + { + "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "3c342e7cc23d90ad2c0193c561b80e87ae763fd0", + "is_secret": false, + "is_verified": false, + "line_number": 133, + "type": "Secret Keyword", + "verified_result": null + } + ], + "samples/security/sso-secret.yaml": [ + { + "hashed_secret": "efb4afcc74d267bdc169ba2d98ae84634cfdab5b", + "is_secret": false, + "is_verified": false, + "line_number": 23, + "type": "Secret Keyword", + "verified_result": null + } + ], + "test/test-pet-clinic/server.xml": [ + { + "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", + "is_secret": false, + "is_verified": false, + "line_number": 19, + "type": "Secret Keyword", + "verified_result": null + } + ], + "test/test-stock-quote/config/server.xml": [ + { + "hashed_secret": "7c6a61c68ef8b9b6b061b28c348bc1ed7921cb53", + "is_secret": false, + "is_verified": false, + "line_number": 27, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_secret": false, + "is_verified": false, + "line_number": 40, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "a3c9a761e42d52632bca5a63fbe6f6d0e70dbb45", + "is_secret": false, + "is_verified": false, + "line_number": 41, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "32faaecac742100f7753f0c1d0aa0add01b4046b", + "is_secret": false, + "is_verified": false, + "line_number": 42, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "f8969a18a0daab6f59b42990613def0b8b6d48eb", + "is_secret": false, + "is_verified": false, + "line_number": 43, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "d0941e68da8f38151ff86a61fc59f7c5cf9fcaa2", + "is_secret": false, + "is_verified": false, + "line_number": 44, + "type": "Secret Keyword", + "verified_result": null + } + ], + "test/test-stock-trader/config/server.xml": [ + { + "hashed_secret": "7c6a61c68ef8b9b6b061b28c348bc1ed7921cb53", + "is_secret": false, + "is_verified": false, + "line_number": 33, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_secret": false, + "is_verified": false, + "line_number": 47, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "a3c9a761e42d52632bca5a63fbe6f6d0e70dbb45", + "is_secret": false, + "is_verified": false, + "line_number": 48, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "32faaecac742100f7753f0c1d0aa0add01b4046b", + "is_secret": false, + "is_verified": false, + "line_number": 49, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "f8969a18a0daab6f59b42990613def0b8b6d48eb", + "is_secret": false, + "is_verified": false, + "line_number": 50, + "type": "Secret Keyword", + "verified_result": null + }, + { + "hashed_secret": "d0941e68da8f38151ff86a61fc59f7c5cf9fcaa2", + "is_secret": false, + "is_verified": false, + "line_number": 51, + "type": "Secret Keyword", + "verified_result": null + } + ] + }, + "version": "0.13.1+ibm.62.dss", + "word_list": { + "file": null, + "hash": null + } +} From f8a81d5b75d42f9b223aa230cc27a004dab8fd10 Mon Sep 17 00:00:00 2001 From: Gkerta Seferi Date: Tue, 22 Oct 2024 21:15:25 +0100 Subject: [PATCH 10/12] Updates for the release of 24.0.0.11 --- .gitignore | 2 +- .secrets.baseline | 28 +++++++++---------- create-new-release.sh | 0 ga/24.0.0.10/images.txt | 18 ------------ ga/24.0.0.11/images.txt | 18 ++++++++++++ ga/{24.0.0.10 => 24.0.0.11/latest}/README.md | 0 .../latest}/full/Dockerfile.ubi.ibmjava8 | 4 +-- .../latest}/full/Dockerfile.ubi.openjdk11 | 4 +-- .../latest}/full/Dockerfile.ubi.openjdk17 | 4 +-- .../latest}/full/Dockerfile.ubi.openjdk21 | 4 +-- .../latest}/full/Dockerfile.ubi.openjdk8 | 4 +-- .../latest}/full/Dockerfile.ubuntu.ibmjava8 | 2 +- .../latest}/full/Dockerfile.ubuntu.openjdk11 | 2 +- .../latest}/full/Dockerfile.ubuntu.openjdk17 | 2 +- .../latest}/full/README.md | 0 .../latest}/full/resources/.gitkeep | 0 .../latest}/full/server.xml | 0 ga/24.0.0.11/latest/images.txt | 18 ++++++++++++ .../latest}/kernel/Dockerfile.ubi.ibmjava8 | 8 +++--- .../latest}/kernel/Dockerfile.ubi.openjdk11 | 8 +++--- .../latest}/kernel/Dockerfile.ubi.openjdk17 | 8 +++--- .../latest}/kernel/Dockerfile.ubi.openjdk21 | 8 +++--- .../latest}/kernel/Dockerfile.ubi.openjdk8 | 8 +++--- .../latest}/kernel/Dockerfile.ubuntu.ibmjava8 | 6 ++-- .../kernel/Dockerfile.ubuntu.openjdk11 | 6 ++-- .../kernel/Dockerfile.ubuntu.openjdk17 | 6 ++-- .../latest}/kernel/NOTICES | 0 .../latest}/kernel/README.md | 0 .../latest}/kernel/fixes/.gitkeep | 0 .../kernel/helpers/build/checkpoint.sh | 0 .../hazelcast-client.xml | 0 .../hazelcast-embedded.xml | 0 .../hazelcast-sessioncache-config.xml | 0 .../hazelcast-sessioncache.xml | 0 .../configuration_snippets/http-endpoint.xml | 0 .../http-ssl-endpoint.xml | 0 .../configuration_snippets/iiop-endpoint.xml | 0 .../iiop-ssl-endpoint.xml | 0 .../infinispan-client-sessioncache-config.xml | 0 .../infinispan-client-sessioncache.xml | 0 .../configuration_snippets/jms-endpoint.xml | 0 .../jms-ssl-endpoint.xml | 0 .../build/configuration_snippets/keystore.xml | 0 .../mp-health-check.xml | 0 .../configuration_snippets/mp-monitoring.xml | 0 .../configuration_snippets/oidc-config.xml | 0 .../build/configuration_snippets/oidc.xml | 0 .../sessioncache-features.xml | 0 .../configuration_snippets/sso-facebook.xml | 0 .../configuration_snippets/sso-features.xml | 0 .../configuration_snippets/sso-github.xml | 0 .../configuration_snippets/sso-google.xml | 0 .../configuration_snippets/sso-linkedin.xml | 0 .../configuration_snippets/sso-oauth2.xml | 0 .../build/configuration_snippets/sso-oidc.xml | 0 .../configuration_snippets/sso-twitter.xml | 0 .../build/configuration_snippets/tls.xml | 0 .../configuration_snippets/trustDefault.xml | 0 .../configuration_snippets/truststore.xml | 0 .../latest}/kernel/helpers/build/configure.sh | 0 .../latest}/kernel/helpers/build/features.sh | 0 .../helpers/build/infinispan-client-setup.sh | 0 .../build/internal/features-installed.sh | 0 .../latest}/kernel/helpers/build/pidplus.sh | 0 .../kernel/helpers/build/populate_scc.sh | 0 .../kernel/helpers/runtime/docker-server.sh | 0 .../kernel/helpers/runtime/restore-server.sh | 0 .../latest}/kernel/resources/.gitkeep | 0 .../latest}/oidcProvider/Dockerfile | 0 .../latest}/oidcProvider/Dockerfile.java11 | 2 +- .../latest}/oidcProvider/README.md | 0 .../latest}/oidcProvider/server.xml | 0 ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 8 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 8 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 8 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk21 | 8 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 8 +++--- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 6 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 6 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 6 ++-- 80 files changed, 123 insertions(+), 105 deletions(-) mode change 100644 => 100755 create-new-release.sh delete mode 100644 ga/24.0.0.10/images.txt create mode 100644 ga/24.0.0.11/images.txt rename ga/{24.0.0.10 => 24.0.0.11/latest}/README.md (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/Dockerfile.ubi.ibmjava8 (93%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/Dockerfile.ubi.openjdk11 (93%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/Dockerfile.ubi.openjdk17 (93%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/Dockerfile.ubi.openjdk21 (93%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/Dockerfile.ubi.openjdk8 (93%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/Dockerfile.ubuntu.ibmjava8 (96%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/Dockerfile.ubuntu.openjdk11 (96%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/Dockerfile.ubuntu.openjdk17 (96%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/README.md (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/resources/.gitkeep (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/full/server.xml (100%) create mode 100644 ga/24.0.0.11/latest/images.txt rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/Dockerfile.ubi.ibmjava8 (97%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/Dockerfile.ubi.openjdk11 (97%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/Dockerfile.ubi.openjdk17 (97%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/Dockerfile.ubi.openjdk21 (97%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/Dockerfile.ubi.openjdk8 (97%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/Dockerfile.ubuntu.ibmjava8 (98%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/Dockerfile.ubuntu.openjdk11 (98%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/Dockerfile.ubuntu.openjdk17 (98%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/NOTICES (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/README.md (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/fixes/.gitkeep (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/checkpoint.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/hazelcast-client.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/http-endpoint.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/jms-endpoint.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/keystore.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/mp-health-check.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/mp-monitoring.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/oidc-config.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/oidc.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sessioncache-features.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sso-facebook.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sso-features.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sso-github.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sso-google.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sso-linkedin.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sso-oauth2.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sso-oidc.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/sso-twitter.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/tls.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/trustDefault.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configuration_snippets/truststore.xml (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/configure.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/features.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/infinispan-client-setup.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/internal/features-installed.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/pidplus.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/build/populate_scc.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/runtime/docker-server.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/helpers/runtime/restore-server.sh (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/kernel/resources/.gitkeep (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/oidcProvider/Dockerfile (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/oidcProvider/Dockerfile.java11 (96%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/oidcProvider/README.md (100%) rename ga/{24.0.0.10 => 24.0.0.11/latest}/oidcProvider/server.xml (100%) diff --git a/.gitignore b/.gitignore index 64b28556f..7987b3779 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ # Ignore .DS_Store .DS_Store -ga/*/*/resources/* \ No newline at end of file +#ga/*/*/resources/* \ No newline at end of file diff --git a/.secrets.baseline b/.secrets.baseline index 820a0ef2a..f2c3fde40 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2024-10-17T10:46:47Z", + "generated_at": "2024-10-22T20:14:16Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -97,7 +97,7 @@ "verified_result": null } ], - "ga/24.0.0.10/full/server.xml": [ + "ga/24.0.0.11/latest/full/server.xml": [ { "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", "is_secret": false, @@ -107,7 +107,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8": [ + "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.ibmjava8": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -117,7 +117,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11": [ + "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk11": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -127,7 +127,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17": [ + "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk17": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -137,7 +137,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21": [ + "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk21": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -147,7 +147,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8": [ + "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk8": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -157,7 +157,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8": [ + "ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.ibmjava8": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -167,7 +167,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk11": [ + "ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk11": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -177,7 +177,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk17": [ + "ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk17": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -187,7 +187,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml": [ + "ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/keystore.xml": [ { "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", "is_secret": false, @@ -197,7 +197,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml": [ + "ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/truststore.xml": [ { "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", "is_secret": false, @@ -207,7 +207,7 @@ "verified_result": null } ], - "ga/24.0.0.10/kernel/helpers/runtime/docker-server.sh": [ + "ga/24.0.0.11/latest/kernel/helpers/runtime/docker-server.sh": [ { "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", "is_secret": false, @@ -217,7 +217,7 @@ "verified_result": null } ], - "ga/24.0.0.10/oidcProvider/server.xml": [ + "ga/24.0.0.11/latest/oidcProvider/server.xml": [ { "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", "is_secret": false, diff --git a/create-new-release.sh b/create-new-release.sh old mode 100644 new mode 100755 diff --git a/ga/24.0.0.10/images.txt b/ga/24.0.0.10/images.txt deleted file mode 100644 index e0bfc045f..000000000 --- a/ga/24.0.0.10/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:24.0.0.10-kernel ../ga/24.0.0.10/kernel ../ga/24.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:24.0.0.10-kernel-java11-openj9 ../ga/24.0.0.10/kernel ../ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:24.0.0.10-kernel-java17-openj9 ../ga/24.0.0.10/kernel ../ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:24.0.0.10-kernel-java8-ibmjava-ubi ../ga/24.0.0.10/kernel ../ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:24.0.0.10-kernel-java8-openj9-ubi ../ga/24.0.0.10/kernel ../ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:24.0.0.10-kernel-java11-openj9-ubi ../ga/24.0.0.10/kernel ../ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:24.0.0.10-kernel-java17-openj9-ubi ../ga/24.0.0.10/kernel ../ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:24.0.0.10-full ../ga/24.0.0.10/full ../ga/24.0.0.10/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:24.0.0.10-full-java11-openj9 ../ga/24.0.0.10/full ../ga/24.0.0.10/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:24.0.0.10-full-java17-openj9 ../ga/24.0.0.10/full ../ga/24.0.0.10/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:24.0.0.10-full-java8-ibmjava-ubi ../ga/24.0.0.10/full ../ga/24.0.0.10/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:24.0.0.10-full-java8-openj9-ubi ../ga/24.0.0.10/full ../ga/24.0.0.10/full/Dockerfile.ubi.openjdk8 -websphere-liberty:24.0.0.10-full-java11-openj9-ubi ../ga/24.0.0.10/full ../ga/24.0.0.10/full/Dockerfile.ubi.openjdk11 -websphere-liberty:24.0.0.10-full-java17-openj9-ubi ../ga/24.0.0.10/full ../ga/24.0.0.10/full/Dockerfile.ubi.openjdk17 -websphere-liberty:beta ../beta -websphere-liberty:test-stock-quote test-stock-quote -websphere-liberty:test-stock-trader test-stock-trader -websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/24.0.0.11/images.txt b/ga/24.0.0.11/images.txt new file mode 100644 index 000000000..b2ad387eb --- /dev/null +++ b/ga/24.0.0.11/images.txt @@ -0,0 +1,18 @@ +websphere-liberty:24.0.0.11-kernel ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:24.0.0.11-kernel-java11-openj9 ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 +websphere-liberty:24.0.0.11-kernel-java17-openj9 ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 +websphere-liberty:24.0.0.11-kernel-java8-ibmjava-ubi ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8 +websphere-liberty:24.0.0.11-kernel-java8-openj9-ubi ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk8 +websphere-liberty:24.0.0.11-kernel-java11-openj9-ubi ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11 +websphere-liberty:24.0.0.11-kernel-java17-openj9-ubi ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17 +websphere-liberty:24.0.0.11-full ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:24.0.0.11-full-java11-openj9 ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubuntu.openjdk11 +websphere-liberty:24.0.0.11-full-java17-openj9 ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubuntu.openjdk17 +websphere-liberty:24.0.0.11-full-java8-ibmjava-ubi ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubi.ibmjava8 +websphere-liberty:24.0.0.11-full-java8-openj9-ubi ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubi.openjdk8 +websphere-liberty:24.0.0.11-full-java11-openj9-ubi ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubi.openjdk11 +websphere-liberty:24.0.0.11-full-java17-openj9-ubi ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubi.openjdk17 +websphere-liberty:beta ../beta +websphere-liberty:test-stock-quote test-stock-quote +websphere-liberty:test-stock-trader test-stock-trader +websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/24.0.0.10/README.md b/ga/24.0.0.11/latest/README.md similarity index 100% rename from ga/24.0.0.10/README.md rename to ga/24.0.0.11/latest/README.md diff --git a/ga/24.0.0.10/full/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.11/latest/full/Dockerfile.ubi.ibmjava8 similarity index 93% rename from ga/24.0.0.10/full/Dockerfile.ubi.ibmjava8 rename to ga/24.0.0.11/latest/full/Dockerfile.ubi.ibmjava8 index 93495d355..c16230393 100644 --- a/ga/24.0.0.10/full/Dockerfile.ubi.ibmjava8 +++ b/ga/24.0.0.11/latest/full/Dockerfile.ubi.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/24.0.0.10/full/Dockerfile.ubi.openjdk11 b/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk11 similarity index 93% rename from ga/24.0.0.10/full/Dockerfile.ubi.openjdk11 rename to ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk11 index 42a44ab53..fcb3d6ac0 100644 --- a/ga/24.0.0.10/full/Dockerfile.ubi.openjdk11 +++ b/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java11-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/24.0.0.10/full/Dockerfile.ubi.openjdk17 b/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk17 similarity index 93% rename from ga/24.0.0.10/full/Dockerfile.ubi.openjdk17 rename to ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk17 index d1f2f82ce..8819783e3 100644 --- a/ga/24.0.0.10/full/Dockerfile.ubi.openjdk17 +++ b/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java17-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/24.0.0.10/full/Dockerfile.ubi.openjdk21 b/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk21 similarity index 93% rename from ga/24.0.0.10/full/Dockerfile.ubi.openjdk21 rename to ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk21 index 08c6a7210..25ac08151 100644 --- a/ga/24.0.0.10/full/Dockerfile.ubi.openjdk21 +++ b/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk21 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java21-openj9-ubi9-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java21-openj9-ubi9-minimal FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java21-openj9-ubi9-minimal +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java21-openj9-ubi9-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/24.0.0.10/full/Dockerfile.ubi.openjdk8 b/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk8 similarity index 93% rename from ga/24.0.0.10/full/Dockerfile.ubi.openjdk8 rename to ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk8 index ca3365e22..d01bc8f54 100644 --- a/ga/24.0.0.10/full/Dockerfile.ubi.openjdk8 +++ b/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/24.0.0.10/full/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.ibmjava8 similarity index 96% rename from ga/24.0.0.10/full/Dockerfile.ubuntu.ibmjava8 rename to ga/24.0.0.11/latest/full/Dockerfile.ubuntu.ibmjava8 index d6cce8369..304181e3b 100644 --- a/ga/24.0.0.10/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:24.0.0.10-kernel-java8-ibmjava +FROM websphere-liberty:24.0.0.11-kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/24.0.0.10/full/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk11 similarity index 96% rename from ga/24.0.0.10/full/Dockerfile.ubuntu.openjdk11 rename to ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk11 index 55b386b7e..161d80e5f 100644 --- a/ga/24.0.0.10/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:24.0.0.10-kernel-java11-openj9 +FROM websphere-liberty:24.0.0.11-kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/24.0.0.10/full/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk17 similarity index 96% rename from ga/24.0.0.10/full/Dockerfile.ubuntu.openjdk17 rename to ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk17 index 07e4e7931..dcab2f0c4 100644 --- a/ga/24.0.0.10/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:24.0.0.10-kernel-java17-openj9 +FROM websphere-liberty:24.0.0.11-kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/24.0.0.10/full/README.md b/ga/24.0.0.11/latest/full/README.md similarity index 100% rename from ga/24.0.0.10/full/README.md rename to ga/24.0.0.11/latest/full/README.md diff --git a/ga/24.0.0.10/full/resources/.gitkeep b/ga/24.0.0.11/latest/full/resources/.gitkeep similarity index 100% rename from ga/24.0.0.10/full/resources/.gitkeep rename to ga/24.0.0.11/latest/full/resources/.gitkeep diff --git a/ga/24.0.0.10/full/server.xml b/ga/24.0.0.11/latest/full/server.xml similarity index 100% rename from ga/24.0.0.10/full/server.xml rename to ga/24.0.0.11/latest/full/server.xml diff --git a/ga/24.0.0.11/latest/images.txt b/ga/24.0.0.11/latest/images.txt new file mode 100644 index 000000000..99a31b31e --- /dev/null +++ b/ga/24.0.0.11/latest/images.txt @@ -0,0 +1,18 @@ +websphere-liberty:kernel ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:kernel-java11-openj9 ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +websphere-liberty:kernel-java17-openj9 ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +websphere-liberty:kernel-java8-ibmjava-ubi ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubi.ibmjava8 +websphere-liberty:kernel-java8-openj9-ubi ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubi.openjdk8 +websphere-liberty:kernel-java11-openj9-ubi ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubi.openjdk11 +websphere-liberty:kernel-java17-openj9-ubi ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubi.openjdk17 +websphere-liberty:full ../ga/latest/full ../ga/latest/full/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:full-java11-openj9 ../ga/latest/full ../ga/latest/full/Dockerfile.ubuntu.openjdk11 +websphere-liberty:full-java17-openj9 ../ga/latest/full ../ga/latest/full/Dockerfile.ubuntu.openjdk17 +websphere-liberty:full-java8-ibmjava-ubi ../ga/latest/full ../ga/latest/full/Dockerfile.ubi.ibmjava8 +websphere-liberty:full-java8-openj9-ubi ../ga/latest/full ../ga/latest/full/Dockerfile.ubi.openjdk8 +websphere-liberty:full-java11-openj9-ubi ../ga/latest/full ../ga/latest/full/Dockerfile.ubi.openjdk11 +websphere-liberty:full-java17-openj9-ubi ../ga/latest/full ../ga/latest/full/Dockerfile.ubi.openjdk17 +websphere-liberty:beta ../beta +websphere-liberty:test-stock-quote test-stock-quote +websphere-liberty:test-stock-trader test-stock-trader +websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.ibmjava8 similarity index 97% rename from ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8 rename to ga/24.0.0.11/latest/kernel/Dockerfile.ubi.ibmjava8 index e952cf6b0..f1c425bf7 100644 --- a/ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk11 similarity index 97% rename from ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11 rename to ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk11 index 478e0acc4..fcbf17c36 100644 --- a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk11 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead @@ -49,8 +49,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk17 similarity index 97% rename from ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17 rename to ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk17 index 576702d7e..70f3d4442 100644 --- a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk17 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk21 similarity index 97% rename from ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21 rename to ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk21 index 912ddf76a..6c6fd371d 100644 --- a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21 +++ b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk21 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk8 similarity index 97% rename from ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8 rename to ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk8 index 214a716c3..f7d671255 100644 --- a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.ibmjava8 similarity index 98% rename from ga/24.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 rename to ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 7a3115c4f..e2ea3f07e 100644 --- a/ga/24.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk11 similarity index 98% rename from ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 rename to ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk11 index a8721de80..2ec9e0dc5 100644 --- a/ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk17 similarity index 98% rename from ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 rename to ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk17 index 80b2e37fa..4bdd820cd 100644 --- a/ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.10/kernel/NOTICES b/ga/24.0.0.11/latest/kernel/NOTICES similarity index 100% rename from ga/24.0.0.10/kernel/NOTICES rename to ga/24.0.0.11/latest/kernel/NOTICES diff --git a/ga/24.0.0.10/kernel/README.md b/ga/24.0.0.11/latest/kernel/README.md similarity index 100% rename from ga/24.0.0.10/kernel/README.md rename to ga/24.0.0.11/latest/kernel/README.md diff --git a/ga/24.0.0.10/kernel/fixes/.gitkeep b/ga/24.0.0.11/latest/kernel/fixes/.gitkeep similarity index 100% rename from ga/24.0.0.10/kernel/fixes/.gitkeep rename to ga/24.0.0.11/latest/kernel/fixes/.gitkeep diff --git a/ga/24.0.0.10/kernel/helpers/build/checkpoint.sh b/ga/24.0.0.11/latest/kernel/helpers/build/checkpoint.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/checkpoint.sh rename to ga/24.0.0.11/latest/kernel/helpers/build/checkpoint.sh diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-client.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-client.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-client.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/http-endpoint.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/http-endpoint.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/http-endpoint.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/jms-endpoint.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/jms-endpoint.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/jms-endpoint.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/keystore.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/keystore.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/mp-health-check.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/mp-health-check.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/mp-health-check.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/mp-monitoring.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/mp-monitoring.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/mp-monitoring.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/oidc-config.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/oidc-config.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/oidc-config.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/oidc.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/oidc.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/oidc.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sessioncache-features.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sessioncache-features.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sessioncache-features.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-facebook.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-facebook.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-facebook.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-features.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-features.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-features.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-github.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-github.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-github.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-google.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-google.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-google.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-linkedin.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-linkedin.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-linkedin.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-oauth2.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-oauth2.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-oauth2.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-oidc.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-oidc.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-oidc.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-twitter.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/sso-twitter.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-twitter.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/tls.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/tls.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/tls.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/tls.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/trustDefault.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/trustDefault.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/trustDefault.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/truststore.xml similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml rename to ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/truststore.xml diff --git a/ga/24.0.0.10/kernel/helpers/build/configure.sh b/ga/24.0.0.11/latest/kernel/helpers/build/configure.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/configure.sh rename to ga/24.0.0.11/latest/kernel/helpers/build/configure.sh diff --git a/ga/24.0.0.10/kernel/helpers/build/features.sh b/ga/24.0.0.11/latest/kernel/helpers/build/features.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/features.sh rename to ga/24.0.0.11/latest/kernel/helpers/build/features.sh diff --git a/ga/24.0.0.10/kernel/helpers/build/infinispan-client-setup.sh b/ga/24.0.0.11/latest/kernel/helpers/build/infinispan-client-setup.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/infinispan-client-setup.sh rename to ga/24.0.0.11/latest/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/24.0.0.10/kernel/helpers/build/internal/features-installed.sh b/ga/24.0.0.11/latest/kernel/helpers/build/internal/features-installed.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/internal/features-installed.sh rename to ga/24.0.0.11/latest/kernel/helpers/build/internal/features-installed.sh diff --git a/ga/24.0.0.10/kernel/helpers/build/pidplus.sh b/ga/24.0.0.11/latest/kernel/helpers/build/pidplus.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/pidplus.sh rename to ga/24.0.0.11/latest/kernel/helpers/build/pidplus.sh diff --git a/ga/24.0.0.10/kernel/helpers/build/populate_scc.sh b/ga/24.0.0.11/latest/kernel/helpers/build/populate_scc.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/build/populate_scc.sh rename to ga/24.0.0.11/latest/kernel/helpers/build/populate_scc.sh diff --git a/ga/24.0.0.10/kernel/helpers/runtime/docker-server.sh b/ga/24.0.0.11/latest/kernel/helpers/runtime/docker-server.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/runtime/docker-server.sh rename to ga/24.0.0.11/latest/kernel/helpers/runtime/docker-server.sh diff --git a/ga/24.0.0.10/kernel/helpers/runtime/restore-server.sh b/ga/24.0.0.11/latest/kernel/helpers/runtime/restore-server.sh similarity index 100% rename from ga/24.0.0.10/kernel/helpers/runtime/restore-server.sh rename to ga/24.0.0.11/latest/kernel/helpers/runtime/restore-server.sh diff --git a/ga/24.0.0.10/kernel/resources/.gitkeep b/ga/24.0.0.11/latest/kernel/resources/.gitkeep similarity index 100% rename from ga/24.0.0.10/kernel/resources/.gitkeep rename to ga/24.0.0.11/latest/kernel/resources/.gitkeep diff --git a/ga/24.0.0.10/oidcProvider/Dockerfile b/ga/24.0.0.11/latest/oidcProvider/Dockerfile similarity index 100% rename from ga/24.0.0.10/oidcProvider/Dockerfile rename to ga/24.0.0.11/latest/oidcProvider/Dockerfile diff --git a/ga/24.0.0.10/oidcProvider/Dockerfile.java11 b/ga/24.0.0.11/latest/oidcProvider/Dockerfile.java11 similarity index 96% rename from ga/24.0.0.10/oidcProvider/Dockerfile.java11 rename to ga/24.0.0.11/latest/oidcProvider/Dockerfile.java11 index e722d7d7f..44af8523f 100644 --- a/ga/24.0.0.10/oidcProvider/Dockerfile.java11 +++ b/ga/24.0.0.11/latest/oidcProvider/Dockerfile.java11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:kernel-java11 +FROM websphere-liberty:24.0.0.11-kernel-java11 ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/24.0.0.10/oidcProvider/README.md b/ga/24.0.0.11/latest/oidcProvider/README.md similarity index 100% rename from ga/24.0.0.10/oidcProvider/README.md rename to ga/24.0.0.11/latest/oidcProvider/README.md diff --git a/ga/24.0.0.10/oidcProvider/server.xml b/ga/24.0.0.11/latest/oidcProvider/server.xml similarity index 100% rename from ga/24.0.0.10/oidcProvider/server.xml rename to ga/24.0.0.11/latest/oidcProvider/server.xml diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index e952cf6b0..f1c425bf7 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index 478e0acc4..fcbf17c36 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead @@ -49,8 +49,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 576702d7e..70f3d4442 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21 index 912ddf76a..6c6fd371d 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk21 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -47,8 +47,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index 214a716c3..f7d671255 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -19,10 +19,10 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=24.0.0.10 +ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -48,8 +48,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 7a3115c4f..e2ea3f07e 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index a8721de80..2ec9e0dc5 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index 80b2e37fa..4bdd820cd 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,9 +19,9 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=24.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl241020240923-1638 -ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf +ARG LIBERTY_VERSION=24.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From 2831228a0ab82b27f5ad3ec167e7751f02c79435 Mon Sep 17 00:00:00 2001 From: Gkerta Seferi Date: Wed, 23 Oct 2024 13:31:55 +0100 Subject: [PATCH 11/12] Updating placeholders and fixing folder structure --- .secrets.baseline | 28 +++++++++---------- ga/24.0.0.11/{latest => }/README.md | 0 .../{latest => }/full/Dockerfile.ubi.ibmjava8 | 0 .../full/Dockerfile.ubi.openjdk11 | 0 .../full/Dockerfile.ubi.openjdk17 | 0 .../full/Dockerfile.ubi.openjdk21 | 0 .../{latest => }/full/Dockerfile.ubi.openjdk8 | 0 .../full/Dockerfile.ubuntu.ibmjava8 | 0 .../full/Dockerfile.ubuntu.openjdk11 | 0 .../full/Dockerfile.ubuntu.openjdk17 | 0 ga/24.0.0.11/{latest => }/full/README.md | 0 .../{latest => }/full/resources/.gitkeep | 0 ga/24.0.0.11/{latest => }/full/server.xml | 0 .../kernel/Dockerfile.ubi.ibmjava8 | 2 +- .../kernel/Dockerfile.ubi.openjdk11 | 2 +- .../kernel/Dockerfile.ubi.openjdk17 | 2 +- .../kernel/Dockerfile.ubi.openjdk21 | 2 +- .../kernel/Dockerfile.ubi.openjdk8 | 2 +- .../kernel/Dockerfile.ubuntu.ibmjava8 | 2 +- .../kernel/Dockerfile.ubuntu.openjdk11 | 2 +- .../kernel/Dockerfile.ubuntu.openjdk17 | 2 +- ga/24.0.0.11/{latest => }/kernel/NOTICES | 0 ga/24.0.0.11/{latest => }/kernel/README.md | 0 .../{latest => }/kernel/fixes/.gitkeep | 0 .../kernel/helpers/build/checkpoint.sh | 0 .../hazelcast-client.xml | 0 .../hazelcast-embedded.xml | 0 .../hazelcast-sessioncache-config.xml | 0 .../hazelcast-sessioncache.xml | 0 .../configuration_snippets/http-endpoint.xml | 0 .../http-ssl-endpoint.xml | 0 .../configuration_snippets/iiop-endpoint.xml | 0 .../iiop-ssl-endpoint.xml | 0 .../infinispan-client-sessioncache-config.xml | 0 .../infinispan-client-sessioncache.xml | 0 .../configuration_snippets/jms-endpoint.xml | 0 .../jms-ssl-endpoint.xml | 0 .../build/configuration_snippets/keystore.xml | 0 .../mp-health-check.xml | 0 .../configuration_snippets/mp-monitoring.xml | 0 .../configuration_snippets/oidc-config.xml | 0 .../build/configuration_snippets/oidc.xml | 0 .../sessioncache-features.xml | 0 .../configuration_snippets/sso-facebook.xml | 0 .../configuration_snippets/sso-features.xml | 0 .../configuration_snippets/sso-github.xml | 0 .../configuration_snippets/sso-google.xml | 0 .../configuration_snippets/sso-linkedin.xml | 0 .../configuration_snippets/sso-oauth2.xml | 0 .../build/configuration_snippets/sso-oidc.xml | 0 .../configuration_snippets/sso-twitter.xml | 0 .../build/configuration_snippets/tls.xml | 0 .../configuration_snippets/trustDefault.xml | 0 .../configuration_snippets/truststore.xml | 0 .../kernel/helpers/build/configure.sh | 0 .../kernel/helpers/build/features.sh | 0 .../helpers/build/infinispan-client-setup.sh | 0 .../build/internal/features-installed.sh | 0 .../kernel/helpers/build/pidplus.sh | 0 .../kernel/helpers/build/populate_scc.sh | 0 .../kernel/helpers/runtime/docker-server.sh | 0 .../kernel/helpers/runtime/restore-server.sh | 0 .../{latest => }/kernel/resources/.gitkeep | 0 ga/24.0.0.11/latest/images.txt | 18 ------------ .../{latest => }/oidcProvider/Dockerfile | 0 .../oidcProvider/Dockerfile.java11 | 0 .../{latest => }/oidcProvider/README.md | 0 .../{latest => }/oidcProvider/server.xml | 0 ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk21 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 2 +- 76 files changed, 30 insertions(+), 48 deletions(-) rename ga/24.0.0.11/{latest => }/README.md (100%) rename ga/24.0.0.11/{latest => }/full/Dockerfile.ubi.ibmjava8 (100%) rename ga/24.0.0.11/{latest => }/full/Dockerfile.ubi.openjdk11 (100%) rename ga/24.0.0.11/{latest => }/full/Dockerfile.ubi.openjdk17 (100%) rename ga/24.0.0.11/{latest => }/full/Dockerfile.ubi.openjdk21 (100%) rename ga/24.0.0.11/{latest => }/full/Dockerfile.ubi.openjdk8 (100%) rename ga/24.0.0.11/{latest => }/full/Dockerfile.ubuntu.ibmjava8 (100%) rename ga/24.0.0.11/{latest => }/full/Dockerfile.ubuntu.openjdk11 (100%) rename ga/24.0.0.11/{latest => }/full/Dockerfile.ubuntu.openjdk17 (100%) rename ga/24.0.0.11/{latest => }/full/README.md (100%) rename ga/24.0.0.11/{latest => }/full/resources/.gitkeep (100%) rename ga/24.0.0.11/{latest => }/full/server.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/Dockerfile.ubi.ibmjava8 (99%) rename ga/24.0.0.11/{latest => }/kernel/Dockerfile.ubi.openjdk11 (99%) rename ga/24.0.0.11/{latest => }/kernel/Dockerfile.ubi.openjdk17 (99%) rename ga/24.0.0.11/{latest => }/kernel/Dockerfile.ubi.openjdk21 (99%) rename ga/24.0.0.11/{latest => }/kernel/Dockerfile.ubi.openjdk8 (99%) rename ga/24.0.0.11/{latest => }/kernel/Dockerfile.ubuntu.ibmjava8 (99%) rename ga/24.0.0.11/{latest => }/kernel/Dockerfile.ubuntu.openjdk11 (99%) rename ga/24.0.0.11/{latest => }/kernel/Dockerfile.ubuntu.openjdk17 (99%) rename ga/24.0.0.11/{latest => }/kernel/NOTICES (100%) rename ga/24.0.0.11/{latest => }/kernel/README.md (100%) rename ga/24.0.0.11/{latest => }/kernel/fixes/.gitkeep (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/checkpoint.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/hazelcast-client.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/http-endpoint.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/jms-endpoint.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/keystore.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/mp-health-check.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/mp-monitoring.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/oidc-config.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/oidc.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sessioncache-features.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sso-facebook.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sso-features.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sso-github.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sso-google.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sso-linkedin.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sso-oauth2.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sso-oidc.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/sso-twitter.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/tls.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/trustDefault.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configuration_snippets/truststore.xml (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/configure.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/features.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/infinispan-client-setup.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/internal/features-installed.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/pidplus.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/build/populate_scc.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/runtime/docker-server.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/helpers/runtime/restore-server.sh (100%) rename ga/24.0.0.11/{latest => }/kernel/resources/.gitkeep (100%) delete mode 100644 ga/24.0.0.11/latest/images.txt rename ga/24.0.0.11/{latest => }/oidcProvider/Dockerfile (100%) rename ga/24.0.0.11/{latest => }/oidcProvider/Dockerfile.java11 (100%) rename ga/24.0.0.11/{latest => }/oidcProvider/README.md (100%) rename ga/24.0.0.11/{latest => }/oidcProvider/server.xml (100%) diff --git a/.secrets.baseline b/.secrets.baseline index f2c3fde40..12d749e53 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2024-10-22T20:14:16Z", + "generated_at": "2024-10-23T12:31:11Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -97,7 +97,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/full/server.xml": [ + "ga/24.0.0.11/full/server.xml": [ { "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13", "is_secret": false, @@ -107,7 +107,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.ibmjava8": [ + "ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -117,7 +117,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk11": [ + "ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -127,7 +127,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk17": [ + "ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -137,7 +137,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk21": [ + "ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk21": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -147,7 +147,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk8": [ + "ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk8": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -157,7 +157,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.ibmjava8": [ + "ga/24.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -167,7 +167,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk11": [ + "ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk11": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -177,7 +177,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk17": [ + "ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk17": [ { "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683", "is_secret": false, @@ -187,7 +187,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/keystore.xml": [ + "ga/24.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml": [ { "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d", "is_secret": false, @@ -197,7 +197,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/truststore.xml": [ + "ga/24.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml": [ { "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45", "is_secret": false, @@ -207,7 +207,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/kernel/helpers/runtime/docker-server.sh": [ + "ga/24.0.0.11/kernel/helpers/runtime/docker-server.sh": [ { "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16", "is_secret": false, @@ -217,7 +217,7 @@ "verified_result": null } ], - "ga/24.0.0.11/latest/oidcProvider/server.xml": [ + "ga/24.0.0.11/oidcProvider/server.xml": [ { "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f", "is_secret": false, diff --git a/ga/24.0.0.11/latest/README.md b/ga/24.0.0.11/README.md similarity index 100% rename from ga/24.0.0.11/latest/README.md rename to ga/24.0.0.11/README.md diff --git a/ga/24.0.0.11/latest/full/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.11/full/Dockerfile.ubi.ibmjava8 similarity index 100% rename from ga/24.0.0.11/latest/full/Dockerfile.ubi.ibmjava8 rename to ga/24.0.0.11/full/Dockerfile.ubi.ibmjava8 diff --git a/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk11 b/ga/24.0.0.11/full/Dockerfile.ubi.openjdk11 similarity index 100% rename from ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk11 rename to ga/24.0.0.11/full/Dockerfile.ubi.openjdk11 diff --git a/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk17 b/ga/24.0.0.11/full/Dockerfile.ubi.openjdk17 similarity index 100% rename from ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk17 rename to ga/24.0.0.11/full/Dockerfile.ubi.openjdk17 diff --git a/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk21 b/ga/24.0.0.11/full/Dockerfile.ubi.openjdk21 similarity index 100% rename from ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk21 rename to ga/24.0.0.11/full/Dockerfile.ubi.openjdk21 diff --git a/ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk8 b/ga/24.0.0.11/full/Dockerfile.ubi.openjdk8 similarity index 100% rename from ga/24.0.0.11/latest/full/Dockerfile.ubi.openjdk8 rename to ga/24.0.0.11/full/Dockerfile.ubi.openjdk8 diff --git a/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.11/full/Dockerfile.ubuntu.ibmjava8 similarity index 100% rename from ga/24.0.0.11/latest/full/Dockerfile.ubuntu.ibmjava8 rename to ga/24.0.0.11/full/Dockerfile.ubuntu.ibmjava8 diff --git a/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.11/full/Dockerfile.ubuntu.openjdk11 similarity index 100% rename from ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk11 rename to ga/24.0.0.11/full/Dockerfile.ubuntu.openjdk11 diff --git a/ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.11/full/Dockerfile.ubuntu.openjdk17 similarity index 100% rename from ga/24.0.0.11/latest/full/Dockerfile.ubuntu.openjdk17 rename to ga/24.0.0.11/full/Dockerfile.ubuntu.openjdk17 diff --git a/ga/24.0.0.11/latest/full/README.md b/ga/24.0.0.11/full/README.md similarity index 100% rename from ga/24.0.0.11/latest/full/README.md rename to ga/24.0.0.11/full/README.md diff --git a/ga/24.0.0.11/latest/full/resources/.gitkeep b/ga/24.0.0.11/full/resources/.gitkeep similarity index 100% rename from ga/24.0.0.11/latest/full/resources/.gitkeep rename to ga/24.0.0.11/full/resources/.gitkeep diff --git a/ga/24.0.0.11/latest/full/server.xml b/ga/24.0.0.11/full/server.xml similarity index 100% rename from ga/24.0.0.11/latest/full/server.xml rename to ga/24.0.0.11/full/server.xml diff --git a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8 similarity index 99% rename from ga/24.0.0.11/latest/kernel/Dockerfile.ubi.ibmjava8 rename to ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8 index f1c425bf7..36ad95270 100644 --- a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11 similarity index 99% rename from ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk11 rename to ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11 index fcbf17c36..46cc0490e 100644 --- a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead diff --git a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17 similarity index 99% rename from ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk17 rename to ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17 index 70f3d4442..d5603fe7e 100644 --- a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk21 similarity index 99% rename from ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk21 rename to ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk21 index 6c6fd371d..c8674bfd8 100644 --- a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk21 +++ b/ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk21 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk8 similarity index 99% rename from ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk8 rename to ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk8 index f7d671255..400b59e41 100644 --- a/ga/24.0.0.11/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 similarity index 99% rename from ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.ibmjava8 rename to ga/24.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 index e2ea3f07e..94f990081 100644 --- a/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/24.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 similarity index 99% rename from ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk11 rename to ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 index 2ec9e0dc5..c33bc96b4 100644 --- a/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 similarity index 99% rename from ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk17 rename to ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 index 4bdd820cd..759faf6f5 100644 --- a/ga/24.0.0.11/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/24.0.0.11/latest/kernel/NOTICES b/ga/24.0.0.11/kernel/NOTICES similarity index 100% rename from ga/24.0.0.11/latest/kernel/NOTICES rename to ga/24.0.0.11/kernel/NOTICES diff --git a/ga/24.0.0.11/latest/kernel/README.md b/ga/24.0.0.11/kernel/README.md similarity index 100% rename from ga/24.0.0.11/latest/kernel/README.md rename to ga/24.0.0.11/kernel/README.md diff --git a/ga/24.0.0.11/latest/kernel/fixes/.gitkeep b/ga/24.0.0.11/kernel/fixes/.gitkeep similarity index 100% rename from ga/24.0.0.11/latest/kernel/fixes/.gitkeep rename to ga/24.0.0.11/kernel/fixes/.gitkeep diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/checkpoint.sh b/ga/24.0.0.11/kernel/helpers/build/checkpoint.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/checkpoint.sh rename to ga/24.0.0.11/kernel/helpers/build/checkpoint.sh diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-client.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-client.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-client.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/http-endpoint.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/http-endpoint.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/http-endpoint.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/jms-endpoint.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/jms-endpoint.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/jms-endpoint.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/keystore.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/mp-health-check.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/mp-health-check.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/mp-health-check.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/mp-monitoring.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/mp-monitoring.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/mp-monitoring.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/oidc-config.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/oidc-config.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/oidc-config.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/oidc.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/oidc.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/oidc.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sessioncache-features.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sessioncache-features.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sessioncache-features.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-facebook.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-facebook.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-facebook.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-features.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-features.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-features.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-github.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-github.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-github.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-google.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-google.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-google.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-linkedin.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-linkedin.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-linkedin.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-oauth2.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-oauth2.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-oauth2.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-oidc.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-oidc.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-oidc.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-twitter.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/sso-twitter.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/sso-twitter.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/tls.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/tls.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/tls.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/tls.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/trustDefault.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/trustDefault.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/trustDefault.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/24.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configuration_snippets/truststore.xml rename to ga/24.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/configure.sh b/ga/24.0.0.11/kernel/helpers/build/configure.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/configure.sh rename to ga/24.0.0.11/kernel/helpers/build/configure.sh diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/features.sh b/ga/24.0.0.11/kernel/helpers/build/features.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/features.sh rename to ga/24.0.0.11/kernel/helpers/build/features.sh diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/24.0.0.11/kernel/helpers/build/infinispan-client-setup.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/infinispan-client-setup.sh rename to ga/24.0.0.11/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/internal/features-installed.sh b/ga/24.0.0.11/kernel/helpers/build/internal/features-installed.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/internal/features-installed.sh rename to ga/24.0.0.11/kernel/helpers/build/internal/features-installed.sh diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/pidplus.sh b/ga/24.0.0.11/kernel/helpers/build/pidplus.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/pidplus.sh rename to ga/24.0.0.11/kernel/helpers/build/pidplus.sh diff --git a/ga/24.0.0.11/latest/kernel/helpers/build/populate_scc.sh b/ga/24.0.0.11/kernel/helpers/build/populate_scc.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/build/populate_scc.sh rename to ga/24.0.0.11/kernel/helpers/build/populate_scc.sh diff --git a/ga/24.0.0.11/latest/kernel/helpers/runtime/docker-server.sh b/ga/24.0.0.11/kernel/helpers/runtime/docker-server.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/runtime/docker-server.sh rename to ga/24.0.0.11/kernel/helpers/runtime/docker-server.sh diff --git a/ga/24.0.0.11/latest/kernel/helpers/runtime/restore-server.sh b/ga/24.0.0.11/kernel/helpers/runtime/restore-server.sh similarity index 100% rename from ga/24.0.0.11/latest/kernel/helpers/runtime/restore-server.sh rename to ga/24.0.0.11/kernel/helpers/runtime/restore-server.sh diff --git a/ga/24.0.0.11/latest/kernel/resources/.gitkeep b/ga/24.0.0.11/kernel/resources/.gitkeep similarity index 100% rename from ga/24.0.0.11/latest/kernel/resources/.gitkeep rename to ga/24.0.0.11/kernel/resources/.gitkeep diff --git a/ga/24.0.0.11/latest/images.txt b/ga/24.0.0.11/latest/images.txt deleted file mode 100644 index 99a31b31e..000000000 --- a/ga/24.0.0.11/latest/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:kernel ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:kernel-java11-openj9 ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:kernel-java17-openj9 ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:kernel-java8-ibmjava-ubi ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:kernel-java8-openj9-ubi ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:kernel-java11-openj9-ubi ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:kernel-java17-openj9-ubi ../ga/latest/kernel ../ga/latest/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:full ../ga/latest/full ../ga/latest/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:full-java11-openj9 ../ga/latest/full ../ga/latest/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:full-java17-openj9 ../ga/latest/full ../ga/latest/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:full-java8-ibmjava-ubi ../ga/latest/full ../ga/latest/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:full-java8-openj9-ubi ../ga/latest/full ../ga/latest/full/Dockerfile.ubi.openjdk8 -websphere-liberty:full-java11-openj9-ubi ../ga/latest/full ../ga/latest/full/Dockerfile.ubi.openjdk11 -websphere-liberty:full-java17-openj9-ubi ../ga/latest/full ../ga/latest/full/Dockerfile.ubi.openjdk17 -websphere-liberty:beta ../beta -websphere-liberty:test-stock-quote test-stock-quote -websphere-liberty:test-stock-trader test-stock-trader -websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/24.0.0.11/latest/oidcProvider/Dockerfile b/ga/24.0.0.11/oidcProvider/Dockerfile similarity index 100% rename from ga/24.0.0.11/latest/oidcProvider/Dockerfile rename to ga/24.0.0.11/oidcProvider/Dockerfile diff --git a/ga/24.0.0.11/latest/oidcProvider/Dockerfile.java11 b/ga/24.0.0.11/oidcProvider/Dockerfile.java11 similarity index 100% rename from ga/24.0.0.11/latest/oidcProvider/Dockerfile.java11 rename to ga/24.0.0.11/oidcProvider/Dockerfile.java11 diff --git a/ga/24.0.0.11/latest/oidcProvider/README.md b/ga/24.0.0.11/oidcProvider/README.md similarity index 100% rename from ga/24.0.0.11/latest/oidcProvider/README.md rename to ga/24.0.0.11/oidcProvider/README.md diff --git a/ga/24.0.0.11/latest/oidcProvider/server.xml b/ga/24.0.0.11/oidcProvider/server.xml similarity index 100% rename from ga/24.0.0.11/latest/oidcProvider/server.xml rename to ga/24.0.0.11/oidcProvider/server.xml diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index f1c425bf7..36ad95270 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index fcbf17c36..46cc0490e 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 70f3d4442..d5603fe7e 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21 index 6c6fd371d..c8674bfd8 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk21 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index f7d671255..400b59e41 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -22,7 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 # If there is a local copy of the image use that instead COPY resources/ /tmp/ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index e2ea3f07e..94f990081 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index 2ec9e0dc5..c33bc96b4 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index 4bdd820cd..759faf6f5 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -21,7 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.11 ARG LIBERTY_BUILD_LABEL=cl241120241021-1102 -ARG LIBERTY_SHA={replace_with_correct_sha} +ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From dca3598255155f6eb87a9808dccc409366cd2df0 Mon Sep 17 00:00:00 2001 From: Gkerta Seferi Date: Wed, 23 Oct 2024 13:34:53 +0100 Subject: [PATCH 12/12] Removing version from oidcProvider dockerfile --- ga/24.0.0.11/oidcProvider/Dockerfile.java11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/24.0.0.11/oidcProvider/Dockerfile.java11 b/ga/24.0.0.11/oidcProvider/Dockerfile.java11 index 44af8523f..e722d7d7f 100644 --- a/ga/24.0.0.11/oidcProvider/Dockerfile.java11 +++ b/ga/24.0.0.11/oidcProvider/Dockerfile.java11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:24.0.0.11-kernel-java11 +FROM websphere-liberty:kernel-java11 ARG REPOSITORIES_PROPERTIES=""