Merge pull request #680 from WASdev/main

Sync up vNext with changes from main

Author: leochr

README.md

@@ -3,7 +3,7 @@
 - [WebSphere Application Server Liberty and Containers](#websphere-application-server-liberty-and-containers)
   - [Container images](#container-images)
   - [Building an application image](#building-an-application-image)
-  - [Optional Enterprise Functionality](#optional-enterprise-functionality)
+  - [Build Variables](#build-variables)
   - [Security](#security)
   - [OpenJ9 Shared Class Cache (SCC)](#openj9-shared-class-cache-scc)
   - [Logging](#logging)
@@ -65,11 +65,11 @@ remoteRepo.user=operator
 remoteRepo.password={aes}KM8dhwcv892Ss1sawu9R+
 ```
 
-Refer to [Repository and proxy modifications](https://openliberty.io/docs/ref/command/featureUtility-modifications.html) for more information.
+Refer to [Repository and proxy modifications](https://openliberty.io/docs/ref/command/featureUtility-commands.html) for more information.
 
-## Optional Enterprise Functionality
+## Build Variables
 
-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:
+This section describes the optional build variables that can be enabled via the Dockerfile during the `build` time, by setting particular build-argument (`ARG`) or environment variable (`ENV`) and calling `RUN configure.sh`.  Each of these variables trigger the inclusion of specific configuration via XML snippets (except for `VERBOSE` and `SKIP_FEATURE_INSTALL`), described below:
 
 * `HZ_SESSION_CACHE`
   *  Description: Enable the persistence of HTTP sessions using JCache by adding the `sessionCache-1.0` feature.
@@ -83,9 +83,9 @@ This section describes the optional enterprise functionality that can be enabled
   *  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.
 
 
-### Deprecated Enterprise Functionality
+### Deprecated Build Variables
 
-The following enterprise functionalities are now **deprecated** and will be **removed** in a future release. You should **stop** using them :
+The following container image build variables are now **deprecated** and will be **removed** in a future release. You should **stop** using them:
 
 * `HTTP_ENDPOINT`
   *  Description: Add configuration properties for an HTTP endpoint.

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.12-kernel-java17-openj9-ubi
+icr.io/appcafe/websphere-liberty:25.0.0.3-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: `25.0.0.1` 
+The following tags include the most recent WebSphere Liberty version: `25.0.0.3` 
 
 ```
 kernel-java21-openj9-ubi-minimal
@@ -48,20 +48,20 @@ full-java8-ibmjava-ubi
 latest
 ```
 
-## 25.0.0.1
+## 25.0.0.3
 
 ```
-25.0.0.1-kernel-java21-openj9-ubi-minimal
-25.0.0.1-kernel-java17-openj9-ubi
-25.0.0.1-kernel-java11-openj9-ubi
-25.0.0.1-kernel-java8-ibmjava-ubi
-25.0.0.1-kernel-java8-openj9-ubi
-
-25.0.0.1-full-java21-openj9-ubi-minimal
-25.0.0.1-full-java17-openj9-ubi
-25.0.0.1-full-java11-openj9-ubi
-25.0.0.1-full-java8-openj9-ubi
-25.0.0.1-full-java8-ibmjava-ubi
+25.0.0.3-kernel-java21-openj9-ubi-minimal
+25.0.0.3-kernel-java17-openj9-ubi
+25.0.0.3-kernel-java11-openj9-ubi
+25.0.0.3-kernel-java8-ibmjava-ubi
+25.0.0.3-kernel-java8-openj9-ubi
+
+25.0.0.3-full-java21-openj9-ubi-minimal
+25.0.0.3-full-java17-openj9-ubi
+25.0.0.3-full-java11-openj9-ubi
+25.0.0.3-full-java8-openj9-ubi
+25.0.0.3-full-java8-ibmjava-ubi
 ```
 
 ## 24.0.0.12
@@ -79,19 +79,3 @@ latest
 24.0.0.12-full-java8-openj9-ubi
 24.0.0.12-full-java8-ibmjava-ubi
 ```
-
-## 24.0.0.9
-
-```
-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
-```

ga/24.0.0.12/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.12-kernel-java21-openj9-ubi9-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.12-kernel-java21-openj9-ubi-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.12-kernel-java21-openj9-ubi9-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.12-kernel-java21-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/25.0.0.3/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:25.0.0.3-kernel-java21-openj9-ubi9-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.3-kernel-java21-openj9-ubi-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:25.0.0.3-kernel-java21-openj9-ubi9-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.3-kernel-java21-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/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:kernel-java21-openj9-ubi9-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java21-openj9-ubi-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:kernel-java21-openj9-ubi9-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java21-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false