Merge 24.0.0.4 vNext commits into main

.travis.yml

@@ -9,7 +9,7 @@ before_install:
   - sudo apt-get update
 env:
   - RELEASE=../ga/23.0.0.12
-  - RELEASE=../ga/24.0.0.3
+  - RELEASE=../ga/24.0.0.4
   - RELEASE=../ga/latest
 
 script:

README.md

@@ -141,6 +141,12 @@ This feature can be controlled via the following variables:
 * `WARM_ENDPOINT_URL` (enviornment variable)
   * Description: The URL to access during SCC population if WARM_ENDPOINT is true.
   * Default: `"localhost:9080/"`.
+* `WARM_OPENAPI_ENDPOINT` (environment variable)
+  * Description: (24.0.0.4+) If `"true"`, curl will be used to access the WARM_OPENAPI_ENDPOINT_URL (see below) during the population of the SCC. This will increase the amount of information in the SCC and improve first request time in subsequent starts of the image.
+  * Default: `"true"`
+* `WARM_OPENAPI_ENDPOINT_URL` (enviornment variable)
+  * Description: (24.0.0.4+) The URL to access during SCC population if WARM_OPENAPI_ENDPOINT is true.
+  * Default: `"localhost:9080/openapi"`
 
 ## Logging
 

ga/24.0.0.4/README.md

@@ -0,0 +1,6 @@
+# WebSphere Application Server Developer Edition Liberty image
+
+Under this directory you can find build scripts for WebSphere Application Server Liberty container images:
+
+* [WebSphere Application Server Developer Edition Liberty, Kernel](kernel)
+* [WebSphere Application Server Developer Edition Liberty, Full](full)

ga/24.0.0.4/full/Dockerfile.ubi.ibmjava8

@@ -0,0 +1,51 @@
+# (C) Copyright IBM Corporation 2023.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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.4-kernel-java8-ibmjava-ubi
+FROM $PARENT_IMAGE AS installBundle
+
+ARG VERBOSE=false
+ARG REPOSITORIES_PROPERTIES=""
+
+# If there is a local copy of the repository use that instead
+COPY resources/ /tmp/
+
+# Install the base bundle
+RUN set -eux; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    mkdir /opt/ibm/wlp/etc/; \
+    echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
+    installUtility install --acceptLicense baseBundle; \
+    rm /opt/ibm/wlp/etc/repositories.properties; \
+  elif [ -f /tmp/wlpRepo.zip ]; then \
+    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
+  else \
+    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  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.4-kernel-java8-ibmjava-ubi
+FROM $PARENT_IMAGE
+ARG VERBOSE=false
+
+# Copy the runtime
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
+
+COPY --chown=1001:0 server.xml /config/
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

ga/24.0.0.4/full/Dockerfile.ubi.openjdk11

@@ -0,0 +1,51 @@
+# (C) Copyright IBM Corporation 2023.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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.4-kernel-java11-openj9-ubi
+FROM $PARENT_IMAGE AS installBundle
+
+ARG VERBOSE=false
+ARG REPOSITORIES_PROPERTIES=""
+
+# If there is a local copy of the repository use that instead
+COPY resources/ /tmp/
+
+# Install the base bundle
+RUN set -eux; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    mkdir /opt/ibm/wlp/etc/; \
+    echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
+    installUtility install --acceptLicense baseBundle; \
+    rm /opt/ibm/wlp/etc/repositories.properties; \
+  elif [ -f /tmp/wlpRepo.zip ]; then \
+    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
+  else \
+    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  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.4-kernel-java11-openj9-ubi
+FROM $PARENT_IMAGE
+ARG VERBOSE=false
+
+# Copy the runtime
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
+
+COPY --chown=1001:0 server.xml /config/
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

ga/24.0.0.4/full/Dockerfile.ubi.openjdk17

@@ -0,0 +1,51 @@
+# (C) Copyright IBM Corporation 2023.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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.4-kernel-java17-openj9-ubi
+FROM $PARENT_IMAGE AS installBundle
+
+ARG VERBOSE=false
+ARG REPOSITORIES_PROPERTIES=""
+
+# If there is a local copy of the repository use that instead
+COPY resources/ /tmp/
+
+# Install the base bundle
+RUN set -eux; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    mkdir /opt/ibm/wlp/etc/; \
+    echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
+    installUtility install --acceptLicense baseBundle; \
+    rm /opt/ibm/wlp/etc/repositories.properties; \
+  elif [ -f /tmp/wlpRepo.zip ]; then \
+    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
+  else \
+    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  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.4-kernel-java17-openj9-ubi
+FROM $PARENT_IMAGE
+ARG VERBOSE=false
+
+# Copy the runtime
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
+
+COPY --chown=1001:0 server.xml /config/
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

ga/24.0.0.4/full/Dockerfile.ubi.openjdk21

@@ -0,0 +1,51 @@
+# (C) Copyright IBM Corporation 2023.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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.4-kernel-java21-openj9-ubi9-minimal
+FROM $PARENT_IMAGE AS installBundle
+
+ARG VERBOSE=false
+ARG REPOSITORIES_PROPERTIES=""
+
+# If there is a local copy of the repository use that instead
+COPY resources/ /tmp/
+
+# Install the base bundle
+RUN set -eux; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    mkdir /opt/ibm/wlp/etc/; \
+    echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
+    installUtility install --acceptLicense baseBundle; \
+    rm /opt/ibm/wlp/etc/repositories.properties; \
+  elif [ -f /tmp/wlpRepo.zip ]; then \
+    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
+  else \
+    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  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.4-kernel-java21-openj9-ubi9-minimal
+FROM $PARENT_IMAGE
+ARG VERBOSE=false
+
+# Copy the runtime
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
+
+COPY --chown=1001:0 server.xml /config/
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

ga/24.0.0.4/full/Dockerfile.ubi.openjdk8

@@ -0,0 +1,51 @@
+# (C) Copyright IBM Corporation 2023.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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.4-kernel-java8-openj9-ubi
+FROM $PARENT_IMAGE AS installBundle
+
+ARG VERBOSE=false
+ARG REPOSITORIES_PROPERTIES=""
+
+# If there is a local copy of the repository use that instead
+COPY resources/ /tmp/
+
+# Install the base bundle
+RUN set -eux; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    mkdir /opt/ibm/wlp/etc/; \
+    echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
+    installUtility install --acceptLicense baseBundle; \
+    rm /opt/ibm/wlp/etc/repositories.properties; \
+  elif [ -f /tmp/wlpRepo.zip ]; then \
+    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
+  else \
+    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  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.4-kernel-java8-openj9-ubi
+FROM $PARENT_IMAGE
+ARG VERBOSE=false
+
+# Copy the runtime
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
+
+COPY --chown=1001:0 server.xml /config/
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

ga/24.0.0.4/full/Dockerfile.ubuntu.ibmjava8

@@ -0,0 +1,38 @@
+# (C) Copyright IBM Corporation 2023.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM websphere-liberty:24.0.0.4-kernel-java8-ibmjava
+
+ARG VERBOSE=false
+ARG REPOSITORIES_PROPERTIES=""
+
+# Install the base bundle
+RUN set -eux; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    mkdir /opt/ibm/wlp/etc/; \
+    echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
+  fi; \
+  installUtility install --acceptLicense baseBundle; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    rm /opt/ibm/wlp/etc/repositories.properties; \
+  fi; \
+  rm -rf /output/workarea /output/logs; \
+  find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
+
+COPY --chown=1001:0 server.xml /config/
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

ga/24.0.0.4/full/Dockerfile.ubuntu.openjdk11

@@ -0,0 +1,38 @@
+# (C) Copyright IBM Corporation 2023.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM websphere-liberty:24.0.0.4-kernel-java11-openj9
+
+ARG VERBOSE=false
+ARG REPOSITORIES_PROPERTIES=""
+
+# Install the base bundle
+RUN set -eux; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    mkdir /opt/ibm/wlp/etc/; \
+    echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
+  fi; \
+  installUtility install --acceptLicense baseBundle; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
+    rm /opt/ibm/wlp/etc/repositories.properties; \
+  fi; \
+  rm -rf /output/workarea /output/logs; \
+  find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
+
+COPY --chown=1001:0 server.xml /config/
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx