From 4140935441512bdfea3d9e2dcd65b985e85963dd Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 5 Sep 2023 10:13:16 -0700 Subject: [PATCH 1/3] Updates for the release of 23.0.0.9 --- .travis.yml | 2 +- ga/23.0.0.8/images.txt | 18 ------------------ ga/{23.0.0.8 => 23.0.0.9}/README.md | 0 .../full/Dockerfile.ubi.ibmjava8 | 4 ++-- .../full/Dockerfile.ubi.openjdk11 | 4 ++-- .../full/Dockerfile.ubi.openjdk17 | 4 ++-- .../full/Dockerfile.ubi.openjdk8 | 4 ++-- .../full/Dockerfile.ubuntu.ibmjava8 | 2 +- .../full/Dockerfile.ubuntu.openjdk11 | 2 +- .../full/Dockerfile.ubuntu.openjdk17 | 2 +- ga/{23.0.0.8 => 23.0.0.9}/full/README.md | 0 .../full/resources/.gitkeep | 0 ga/{23.0.0.8 => 23.0.0.9}/full/server.xml | 0 ga/23.0.0.9/images.txt | 18 ++++++++++++++++++ .../kernel/Dockerfile.ubi.ibmjava8 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk11 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk17 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk8 | 6 +++--- .../kernel/Dockerfile.ubuntu.ibmjava8 | 4 ++-- .../kernel/Dockerfile.ubuntu.openjdk11 | 4 ++-- .../kernel/Dockerfile.ubuntu.openjdk17 | 4 ++-- ga/{23.0.0.8 => 23.0.0.9}/kernel/NOTICES | 0 ga/{23.0.0.8 => 23.0.0.9}/kernel/README.md | 0 .../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 .../configuration_snippets/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 .../kernel/resources/.gitkeep | 0 .../oidcProvider/Dockerfile | 0 .../oidcProvider/Dockerfile.java11 | 0 .../oidcProvider/README.md | 0 .../oidcProvider/server.xml | 0 ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 6 +++--- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 4 ++-- 74 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 ga/23.0.0.8/images.txt rename ga/{23.0.0.8 => 23.0.0.9}/README.md (100%) rename ga/{23.0.0.8 => 23.0.0.9}/full/Dockerfile.ubi.ibmjava8 (91%) rename ga/{23.0.0.8 => 23.0.0.9}/full/Dockerfile.ubi.openjdk11 (91%) rename ga/{23.0.0.8 => 23.0.0.9}/full/Dockerfile.ubi.openjdk17 (91%) rename ga/{23.0.0.8 => 23.0.0.9}/full/Dockerfile.ubi.openjdk8 (91%) rename ga/{23.0.0.8 => 23.0.0.9}/full/Dockerfile.ubuntu.ibmjava8 (96%) rename ga/{23.0.0.8 => 23.0.0.9}/full/Dockerfile.ubuntu.openjdk11 (96%) rename ga/{23.0.0.8 => 23.0.0.9}/full/Dockerfile.ubuntu.openjdk17 (96%) rename ga/{23.0.0.8 => 23.0.0.9}/full/README.md (100%) rename ga/{23.0.0.8 => 23.0.0.9}/full/resources/.gitkeep (100%) rename ga/{23.0.0.8 => 23.0.0.9}/full/server.xml (100%) create mode 100644 ga/23.0.0.9/images.txt rename ga/{23.0.0.8 => 23.0.0.9}/kernel/Dockerfile.ubi.ibmjava8 (98%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/Dockerfile.ubi.openjdk11 (98%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/Dockerfile.ubi.openjdk17 (98%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/Dockerfile.ubi.openjdk8 (98%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/Dockerfile.ubuntu.ibmjava8 (98%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/Dockerfile.ubuntu.openjdk11 (98%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/Dockerfile.ubuntu.openjdk17 (98%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/NOTICES (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/README.md (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/fixes/.gitkeep (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/checkpoint.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/hazelcast-client.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/http-endpoint.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/jms-endpoint.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/keystore.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/mp-health-check.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/mp-monitoring.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/oidc-config.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/oidc.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sessioncache-features.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sso-facebook.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sso-features.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sso-github.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sso-google.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sso-linkedin.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sso-oauth2.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sso-oidc.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/sso-twitter.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/tls.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/trustDefault.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configuration_snippets/truststore.xml (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/configure.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/features.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/infinispan-client-setup.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/internal/features-installed.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/pidplus.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/build/populate_scc.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/runtime/docker-server.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/helpers/runtime/restore-server.sh (100%) rename ga/{23.0.0.8 => 23.0.0.9}/kernel/resources/.gitkeep (100%) rename ga/{23.0.0.8 => 23.0.0.9}/oidcProvider/Dockerfile (100%) rename ga/{23.0.0.8 => 23.0.0.9}/oidcProvider/Dockerfile.java11 (100%) rename ga/{23.0.0.8 => 23.0.0.9}/oidcProvider/README.md (100%) rename ga/{23.0.0.8 => 23.0.0.9}/oidcProvider/server.xml (100%) diff --git a/.travis.yml b/.travis.yml index 82054bf16..176de034c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: env: - RELEASE=../ga/23.0.0.3 - RELEASE=../ga/23.0.0.6 - - RELEASE=../ga/23.0.0.8 + - RELEASE=../ga/23.0.0.9 - RELEASE=../ga/latest script: diff --git a/ga/23.0.0.8/images.txt b/ga/23.0.0.8/images.txt deleted file mode 100644 index 14821150e..000000000 --- a/ga/23.0.0.8/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:23.0.0.8-kernel ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.8-kernel-java11-openj9 ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.8-kernel-java17-openj9 ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.8-kernel-java8-ibmjava-ubi ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.8-kernel-java8-openj9-ubi ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.8-kernel-java11-openj9-ubi ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.8-kernel-java17-openj9-ubi ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:23.0.0.8-full ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.8-full-java11-openj9 ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.8-full-java17-openj9 ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.8-full-java8-ibmjava-ubi ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.8-full-java8-openj9-ubi ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.8-full-java11-openj9-ubi ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.8-full-java17-openj9-ubi ../ga/23.0.0.8/full ../ga/23.0.0.8/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/23.0.0.8/README.md b/ga/23.0.0.9/README.md similarity index 100% rename from ga/23.0.0.8/README.md rename to ga/23.0.0.9/README.md diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.9/full/Dockerfile.ubi.ibmjava8 similarity index 91% rename from ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.9/full/Dockerfile.ubi.ibmjava8 index b413d39c2..8323de579 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.9/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:23.0.0.8-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty: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:23.0.0.8-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.9/full/Dockerfile.ubi.openjdk11 similarity index 91% rename from ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.9/full/Dockerfile.ubi.openjdk11 index 109ccb8eb..8669e3adf 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.9/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:23.0.0.8-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty: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:23.0.0.8-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.9/full/Dockerfile.ubi.openjdk17 similarity index 91% rename from ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.9/full/Dockerfile.ubi.openjdk17 index a190b20f8..e38227406 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.9/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:23.0.0.8-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty: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:23.0.0.8-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.9/full/Dockerfile.ubi.openjdk8 similarity index 91% rename from ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.9/full/Dockerfile.ubi.openjdk8 index 921103188..0081f5719 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.9/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:23.0.0.8-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty: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:23.0.0.8-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.9/full/Dockerfile.ubuntu.ibmjava8 similarity index 96% rename from ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.9/full/Dockerfile.ubuntu.ibmjava8 index 1ff695561..c301dfec2 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.9/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:23.0.0.8-kernel-java8-ibmjava +FROM websphere-liberty:kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 similarity index 96% rename from ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 index 11cfdc57b..305136390 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.9/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:23.0.0.8-kernel-java11-openj9 +FROM websphere-liberty:kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 similarity index 96% rename from ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 index 16872360c..58d75c5a0 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.9/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:23.0.0.8-kernel-java17-openj9 +FROM websphere-liberty:kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.8/full/README.md b/ga/23.0.0.9/full/README.md similarity index 100% rename from ga/23.0.0.8/full/README.md rename to ga/23.0.0.9/full/README.md diff --git a/ga/23.0.0.8/full/resources/.gitkeep b/ga/23.0.0.9/full/resources/.gitkeep similarity index 100% rename from ga/23.0.0.8/full/resources/.gitkeep rename to ga/23.0.0.9/full/resources/.gitkeep diff --git a/ga/23.0.0.8/full/server.xml b/ga/23.0.0.9/full/server.xml similarity index 100% rename from ga/23.0.0.8/full/server.xml rename to ga/23.0.0.9/full/server.xml diff --git a/ga/23.0.0.9/images.txt b/ga/23.0.0.9/images.txt new file mode 100644 index 000000000..188ed532d --- /dev/null +++ b/ga/23.0.0.9/images.txt @@ -0,0 +1,18 @@ +websphere-liberty:23.0.0.9-kernel ../ga/23.0.0.9/kernel ../ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.9-kernel-java11-openj9 ../ga/23.0.0.9/kernel ../ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.9-kernel-java17-openj9 ../ga/23.0.0.9/kernel ../ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.9-kernel-java8-ibmjava-ubi ../ga/23.0.0.9/kernel ../ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.9-kernel-java8-openj9-ubi ../ga/23.0.0.9/kernel ../ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.9-kernel-java11-openj9-ubi ../ga/23.0.0.9/kernel ../ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.9-kernel-java17-openj9-ubi ../ga/23.0.0.9/kernel ../ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 +websphere-liberty:23.0.0.9-full ../ga/23.0.0.9/full ../ga/23.0.0.9/full/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.9-full-java11-openj9 ../ga/23.0.0.9/full ../ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.9-full-java17-openj9 ../ga/23.0.0.9/full ../ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.9-full-java8-ibmjava-ubi ../ga/23.0.0.9/full ../ga/23.0.0.9/full/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.9-full-java8-openj9-ubi ../ga/23.0.0.9/full ../ga/23.0.0.9/full/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.9-full-java11-openj9-ubi ../ga/23.0.0.9/full ../ga/23.0.0.9/full/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.9-full-java17-openj9-ubi ../ga/23.0.0.9/full ../ga/23.0.0.9/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/23.0.0.8/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 similarity index 98% rename from ga/23.0.0.8/kernel/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 index c4c582a7c..a9b708366 100644 --- a/ga/23.0.0.8/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 similarity index 98% rename from ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 index 8a40ddee7..b607741be 100644 --- a/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 similarity index 98% rename from ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 index ccf8ee982..4e948af1a 100644 --- a/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 similarity index 98% rename from ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 index 2a725f691..98ba4446d 100644 --- a/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 similarity index 98% rename from ga/23.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 index eb12964a2..27b0e54db 100644 --- a/ga/23.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 similarity index 98% rename from ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 index 765ce5591..851e49da6 100644 --- a/ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 similarity index 98% rename from ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 index 3247b5a20..2c317aeae 100644 --- a/ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.8/kernel/NOTICES b/ga/23.0.0.9/kernel/NOTICES similarity index 100% rename from ga/23.0.0.8/kernel/NOTICES rename to ga/23.0.0.9/kernel/NOTICES diff --git a/ga/23.0.0.8/kernel/README.md b/ga/23.0.0.9/kernel/README.md similarity index 100% rename from ga/23.0.0.8/kernel/README.md rename to ga/23.0.0.9/kernel/README.md diff --git a/ga/23.0.0.8/kernel/fixes/.gitkeep b/ga/23.0.0.9/kernel/fixes/.gitkeep similarity index 100% rename from ga/23.0.0.8/kernel/fixes/.gitkeep rename to ga/23.0.0.9/kernel/fixes/.gitkeep diff --git a/ga/23.0.0.8/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.9/kernel/helpers/build/checkpoint.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/checkpoint.sh rename to ga/23.0.0.9/kernel/helpers/build/checkpoint.sh diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-client.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-client.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-client.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/http-endpoint.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/http-endpoint.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/http-endpoint.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/jms-endpoint.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/jms-endpoint.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/jms-endpoint.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/keystore.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/mp-health-check.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/mp-health-check.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/mp-health-check.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/mp-monitoring.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/mp-monitoring.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/mp-monitoring.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/oidc-config.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/oidc-config.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/oidc-config.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/oidc.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/oidc.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/oidc.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sessioncache-features.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sessioncache-features.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sessioncache-features.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-facebook.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-facebook.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-facebook.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-features.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-features.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-features.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-github.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-github.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-github.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-google.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-google.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-google.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-linkedin.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-linkedin.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-linkedin.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-oauth2.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-oauth2.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-oauth2.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-oidc.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-oidc.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-oidc.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-twitter.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-twitter.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/sso-twitter.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/tls.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/tls.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/tls.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/tls.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/trustDefault.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/trustDefault.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/trustDefault.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/23.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml rename to ga/23.0.0.9/kernel/helpers/build/configuration_snippets/truststore.xml diff --git a/ga/23.0.0.8/kernel/helpers/build/configure.sh b/ga/23.0.0.9/kernel/helpers/build/configure.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/configure.sh rename to ga/23.0.0.9/kernel/helpers/build/configure.sh diff --git a/ga/23.0.0.8/kernel/helpers/build/features.sh b/ga/23.0.0.9/kernel/helpers/build/features.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/features.sh rename to ga/23.0.0.9/kernel/helpers/build/features.sh diff --git a/ga/23.0.0.8/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.9/kernel/helpers/build/infinispan-client-setup.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/infinispan-client-setup.sh rename to ga/23.0.0.9/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/23.0.0.8/kernel/helpers/build/internal/features-installed.sh b/ga/23.0.0.9/kernel/helpers/build/internal/features-installed.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/internal/features-installed.sh rename to ga/23.0.0.9/kernel/helpers/build/internal/features-installed.sh diff --git a/ga/23.0.0.8/kernel/helpers/build/pidplus.sh b/ga/23.0.0.9/kernel/helpers/build/pidplus.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/pidplus.sh rename to ga/23.0.0.9/kernel/helpers/build/pidplus.sh diff --git a/ga/23.0.0.8/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.9/kernel/helpers/build/populate_scc.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/build/populate_scc.sh rename to ga/23.0.0.9/kernel/helpers/build/populate_scc.sh diff --git a/ga/23.0.0.8/kernel/helpers/runtime/docker-server.sh b/ga/23.0.0.9/kernel/helpers/runtime/docker-server.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/runtime/docker-server.sh rename to ga/23.0.0.9/kernel/helpers/runtime/docker-server.sh diff --git a/ga/23.0.0.8/kernel/helpers/runtime/restore-server.sh b/ga/23.0.0.9/kernel/helpers/runtime/restore-server.sh similarity index 100% rename from ga/23.0.0.8/kernel/helpers/runtime/restore-server.sh rename to ga/23.0.0.9/kernel/helpers/runtime/restore-server.sh diff --git a/ga/23.0.0.8/kernel/resources/.gitkeep b/ga/23.0.0.9/kernel/resources/.gitkeep similarity index 100% rename from ga/23.0.0.8/kernel/resources/.gitkeep rename to ga/23.0.0.9/kernel/resources/.gitkeep diff --git a/ga/23.0.0.8/oidcProvider/Dockerfile b/ga/23.0.0.9/oidcProvider/Dockerfile similarity index 100% rename from ga/23.0.0.8/oidcProvider/Dockerfile rename to ga/23.0.0.9/oidcProvider/Dockerfile diff --git a/ga/23.0.0.8/oidcProvider/Dockerfile.java11 b/ga/23.0.0.9/oidcProvider/Dockerfile.java11 similarity index 100% rename from ga/23.0.0.8/oidcProvider/Dockerfile.java11 rename to ga/23.0.0.9/oidcProvider/Dockerfile.java11 diff --git a/ga/23.0.0.8/oidcProvider/README.md b/ga/23.0.0.9/oidcProvider/README.md similarity index 100% rename from ga/23.0.0.8/oidcProvider/README.md rename to ga/23.0.0.9/oidcProvider/README.md diff --git a/ga/23.0.0.8/oidcProvider/server.xml b/ga/23.0.0.9/oidcProvider/server.xml similarity index 100% rename from ga/23.0.0.8/oidcProvider/server.xml rename to ga/23.0.0.9/oidcProvider/server.xml diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index c4c582a7c..a9b708366 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 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 8a40ddee7..b607741be 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 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 ccf8ee982..4e948af1a 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 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 2a725f691..98ba4446d 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 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 eb12964a2..27b0e54db 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 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 765ce5591..851e49da6 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 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 3247b5a20..2c317aeae 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.8 -ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 +ARG LIBERTY_VERSION=23.0.0.9 +ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From 0deca43f1a156e13839d053e4374b104653555e7 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 5 Sep 2023 10:27:10 -0700 Subject: [PATCH 2/3] Remove 23.0.0.3 --- .travis.yml | 1 - ga/23.0.0.3/README.md | 6 - ga/23.0.0.3/full/Dockerfile.ubi.ibmjava8 | 32 --- ga/23.0.0.3/full/Dockerfile.ubi.openjdk11 | 32 --- ga/23.0.0.3/full/Dockerfile.ubi.openjdk17 | 32 --- ga/23.0.0.3/full/Dockerfile.ubi.openjdk8 | 32 --- ga/23.0.0.3/full/Dockerfile.ubuntu.ibmjava8 | 32 --- ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk11 | 31 --- ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk17 | 31 --- ga/23.0.0.3/full/README.md | 7 - ga/23.0.0.3/full/server.xml | 36 --- ga/23.0.0.3/images.txt | 18 -- ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 | 130 ----------- ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11 | 131 ----------- ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17 | 131 ----------- ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8 | 131 ----------- ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8 | 129 ----------- .../kernel/Dockerfile.ubuntu.openjdk11 | 129 ----------- .../kernel/Dockerfile.ubuntu.openjdk17 | 129 ----------- ga/23.0.0.3/kernel/README.md | 9 - ga/23.0.0.3/kernel/fixes/.gitkeep | 2 - .../hazelcast-client.xml | 16 -- .../hazelcast-embedded.xml | 19 -- .../hazelcast-sessioncache-config.xml | 8 - .../hazelcast-sessioncache.xml | 11 - .../configuration_snippets/http-endpoint.xml | 5 - .../http-ssl-endpoint.xml | 6 - .../configuration_snippets/iiop-endpoint.xml | 5 - .../iiop-ssl-endpoint.xml | 8 - .../infinispan-client-sessioncache-config.xml | 16 -- .../infinispan-client-sessioncache.xml | 19 -- .../configuration_snippets/jms-endpoint.xml | 5 - .../jms-ssl-endpoint.xml | 5 - .../build/configuration_snippets/keystore.xml | 3 - .../mp-health-check.xml | 6 - .../configuration_snippets/mp-monitoring.xml | 9 - .../configuration_snippets/oidc-config.xml | 8 - .../build/configuration_snippets/oidc.xml | 6 - .../sessioncache-features.xml | 5 - .../configuration_snippets/sso-facebook.xml | 19 -- .../configuration_snippets/sso-features.xml | 7 - .../configuration_snippets/sso-github.xml | 24 -- .../configuration_snippets/sso-google.xml | 19 -- .../configuration_snippets/sso-linkedin.xml | 19 -- .../configuration_snippets/sso-oauth2.xml | 51 ---- .../build/configuration_snippets/sso-oidc.xml | 38 --- .../configuration_snippets/sso-twitter.xml | 17 -- .../build/configuration_snippets/tls.xml | 5 - .../configuration_snippets/trustDefault.xml | 4 - .../configuration_snippets/truststore.xml | 5 - ga/23.0.0.3/kernel/helpers/build/configure.sh | 219 ------------------ ga/23.0.0.3/kernel/helpers/build/features.sh | 48 ---- .../helpers/build/infinispan-client-setup.sh | 35 --- .../build/internal/features-installed.sh | 9 - .../kernel/helpers/build/populate_scc.sh | 140 ----------- .../kernel/helpers/runtime/docker-server.sh | 145 ------------ ga/23.0.0.3/oidcProvider/Dockerfile | 32 --- ga/23.0.0.3/oidcProvider/Dockerfile.java11 | 32 --- ga/23.0.0.3/oidcProvider/README.md | 7 - ga/23.0.0.3/oidcProvider/server.xml | 143 ------------ 60 files changed, 2389 deletions(-) delete mode 100644 ga/23.0.0.3/README.md delete mode 100644 ga/23.0.0.3/full/Dockerfile.ubi.ibmjava8 delete mode 100644 ga/23.0.0.3/full/Dockerfile.ubi.openjdk11 delete mode 100644 ga/23.0.0.3/full/Dockerfile.ubi.openjdk17 delete mode 100644 ga/23.0.0.3/full/Dockerfile.ubi.openjdk8 delete mode 100644 ga/23.0.0.3/full/Dockerfile.ubuntu.ibmjava8 delete mode 100644 ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk11 delete mode 100644 ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk17 delete mode 100644 ga/23.0.0.3/full/README.md delete mode 100644 ga/23.0.0.3/full/server.xml delete mode 100644 ga/23.0.0.3/images.txt delete mode 100644 ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 delete mode 100644 ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11 delete mode 100644 ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17 delete mode 100644 ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8 delete mode 100644 ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8 delete mode 100644 ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk11 delete mode 100644 ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk17 delete mode 100644 ga/23.0.0.3/kernel/README.md delete mode 100644 ga/23.0.0.3/kernel/fixes/.gitkeep delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-client.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/http-endpoint.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/jms-endpoint.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/keystore.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/mp-health-check.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/mp-monitoring.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/oidc-config.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/oidc.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sessioncache-features.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-facebook.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-features.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-github.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-google.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-linkedin.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-oauth2.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-oidc.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-twitter.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/tls.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/trustDefault.xml delete mode 100644 ga/23.0.0.3/kernel/helpers/build/configuration_snippets/truststore.xml delete mode 100755 ga/23.0.0.3/kernel/helpers/build/configure.sh delete mode 100755 ga/23.0.0.3/kernel/helpers/build/features.sh delete mode 100755 ga/23.0.0.3/kernel/helpers/build/infinispan-client-setup.sh delete mode 100755 ga/23.0.0.3/kernel/helpers/build/internal/features-installed.sh delete mode 100755 ga/23.0.0.3/kernel/helpers/build/populate_scc.sh delete mode 100755 ga/23.0.0.3/kernel/helpers/runtime/docker-server.sh delete mode 100644 ga/23.0.0.3/oidcProvider/Dockerfile delete mode 100644 ga/23.0.0.3/oidcProvider/Dockerfile.java11 delete mode 100644 ga/23.0.0.3/oidcProvider/README.md delete mode 100644 ga/23.0.0.3/oidcProvider/server.xml diff --git a/.travis.yml b/.travis.yml index 176de034c..1dc9ce89f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ services: before_install: - sudo apt-get update env: - - RELEASE=../ga/23.0.0.3 - RELEASE=../ga/23.0.0.6 - RELEASE=../ga/23.0.0.9 - RELEASE=../ga/latest diff --git a/ga/23.0.0.3/README.md b/ga/23.0.0.3/README.md deleted file mode 100644 index e0d4b8c1a..000000000 --- a/ga/23.0.0.3/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# 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) diff --git a/ga/23.0.0.3/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.3/full/Dockerfile.ubi.ibmjava8 deleted file mode 100644 index 971ce1cf9..000000000 --- a/ga/23.0.0.3/full/Dockerfile.ubi.ibmjava8 +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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:23.0.0.3-kernel-java8-ibmjava-ubi -FROM $PARENT_IMAGE -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -RUN 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 diff --git a/ga/23.0.0.3/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.3/full/Dockerfile.ubi.openjdk11 deleted file mode 100644 index acbd886c3..000000000 --- a/ga/23.0.0.3/full/Dockerfile.ubi.openjdk11 +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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:23.0.0.3-kernel-java11-openj9-ubi -FROM $PARENT_IMAGE -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -RUN 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 diff --git a/ga/23.0.0.3/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.3/full/Dockerfile.ubi.openjdk17 deleted file mode 100644 index 55b1fb6a5..000000000 --- a/ga/23.0.0.3/full/Dockerfile.ubi.openjdk17 +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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:23.0.0.3-kernel-java17-openj9-ubi -FROM $PARENT_IMAGE -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -RUN 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 diff --git a/ga/23.0.0.3/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.3/full/Dockerfile.ubi.openjdk8 deleted file mode 100644 index a687b21b5..000000000 --- a/ga/23.0.0.3/full/Dockerfile.ubi.openjdk8 +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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:23.0.0.3-kernel-java8-openj9-ubi -FROM $PARENT_IMAGE -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -RUN 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 diff --git a/ga/23.0.0.3/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.3/full/Dockerfile.ubuntu.ibmjava8 deleted file mode 100644 index 6d6d37a7e..000000000 --- a/ga/23.0.0.3/full/Dockerfile.ubuntu.ibmjava8 +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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:23.0.0.3-kernel-java8-ibmjava -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -RUN 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 - diff --git a/ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk11 deleted file mode 100644 index f8ae71bdb..000000000 --- a/ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk11 +++ /dev/null @@ -1,31 +0,0 @@ -# (C) Copyright IBM Corporation 2020. -# -# 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:23.0.0.3-kernel-java11-openj9 -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -RUN 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 diff --git a/ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk17 deleted file mode 100644 index 00b7ba009..000000000 --- a/ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk17 +++ /dev/null @@ -1,31 +0,0 @@ -# (C) Copyright IBM Corporation 2020. -# -# 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:23.0.0.3-kernel-java17-openj9 -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -RUN 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 diff --git a/ga/23.0.0.3/full/README.md b/ga/23.0.0.3/full/README.md deleted file mode 100644 index 4292ed4c6..000000000 --- a/ga/23.0.0.3/full/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# WebSphere Application Server Developer Edition Liberty image - -The [Dockerfile.ubuntu.ibmjava8](Dockerfile.ubuntu.ibmjava8) in this directory is used to build the `websphere-liberty:full` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). The image contains IBM WebSphere Liberty with an extensive set of features for convenience. - -# Usage - -Instructions for using the image can be found on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). It is possible to build the image yourself by cloning this repository, changing to the `ga//full` directory and then issuing the command to build container image. For example, with Docker execute `docker build .`. diff --git a/ga/23.0.0.3/full/server.xml b/ga/23.0.0.3/full/server.xml deleted file mode 100644 index 9d0b33f75..000000000 --- a/ga/23.0.0.3/full/server.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - javaee-8.0 - microProfile-3.0 - - - - - - - - - - - - - - - - - - - diff --git a/ga/23.0.0.3/images.txt b/ga/23.0.0.3/images.txt deleted file mode 100644 index 8cc722703..000000000 --- a/ga/23.0.0.3/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:23.0.0.3-kernel ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.3-kernel-java11-openj9 ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.3-kernel-java17-openj9 ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.3-kernel-java8-ibmjava-ubi ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.3-kernel-java8-openj9-ubi ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.3-kernel-java11-openj9-ubi ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.3-kernel-java17-openj9-ubi ../ga/23.0.0.3/kernel ../ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:23.0.0.3-full ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.3-full-java11-openj9 ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.3-full-java17-openj9 ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.3-full-java8-ibmjava-ubi ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.3-full-java8-openj9-ubi ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.3-full-java11-openj9-ubi ../ga/23.0.0.3/full ../ga/23.0.0.3/full/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.3-full-java17-openj9-ubi ../ga/23.0.0.3/full ../ga/23.0.0.3/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/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 deleted file mode 100644 index b7015c750..000000000 --- a/ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 +++ /dev/null @@ -1,130 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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 ibmjava:8-ubi - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true -ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f -ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f -ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="http://wasdev.net" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="23.0.0.3" \ - org.opencontainers.image.revision="cl230320230319-1900" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="23.0.0.3" \ - summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ - description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" - -# Install WebSphere Liberty -ENV LIBERTY_VERSION 23.0.0_03 - -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -RUN yum -y install unzip wget openssl \ - && yum clean all \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && LICENSE_BASE=$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*license:\s//p' | sed 's/\(.*\)\/.*/\1\//' | tr -d '\r') \ - && wget ${LICENSE_BASE}en.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/en.html \ - && wget ${LICENSE_BASE}non_ibm_license.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/non_ibm_license.html \ - && wget ${LICENSE_BASE}notices.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/notices.html \ - && echo "$EN_SHA /licenses/en.html" | sha256sum -c --strict --check \ - && echo "$NON_IBM_SHA /licenses/non_ibm_license.html" | sha256sum -c --strict --check \ - && echo "$NOTICES_SHA /licenses/notices.html" | sha256sum -c --strict --check \ - && chmod -R g+x /usr/bin \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && yum -y remove unzip wget \ - && yum clean all - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="23.0.0.3" \ - "BuildLabel"="cl230320230319-1900" - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea - -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# 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 \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11 deleted file mode 100644 index 30b75dddf..000000000 --- a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11 +++ /dev/null @@ -1,131 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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 icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true -ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f -ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f -ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="http://wasdev.net" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="23.0.0.3" \ - org.opencontainers.image.revision="cl230320230319-1900" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="23.0.0.3" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" - -# Install WebSphere Liberty -ENV LIBERTY_VERSION 23.0.0_03 - -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -RUN yum -y install shadow-utils unzip wget findutils openssl \ - && yum clean all \ - && mkdir -p /licenses \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && LICENSE_BASE=$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*license:\s//p' | sed 's/\(.*\)\/.*/\1\//' | tr -d '\r') \ - && wget ${LICENSE_BASE}en.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/en.html \ - && wget ${LICENSE_BASE}non_ibm_license.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/non_ibm_license.html \ - && wget ${LICENSE_BASE}notices.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/notices.html \ - && echo "$EN_SHA /licenses/en.html" | sha256sum -c --strict --check \ - && echo "$NON_IBM_SHA /licenses/non_ibm_license.html" | sha256sum -c --strict --check \ - && echo "$NOTICES_SHA /licenses/notices.html" | sha256sum -c --strict --check \ - && chmod -R g+x /usr/bin \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && yum -y remove shadow-utils unzip wget \ - && yum clean all - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="23.0.0.3" \ - "BuildLabel"="cl230320230319-1900" - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea - -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# 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 \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17 deleted file mode 100644 index 77c7e59a8..000000000 --- a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17 +++ /dev/null @@ -1,131 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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 icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true -ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f -ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f -ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Chris Potter, Melissa Lee" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="http://wasdev.net" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="23.0.0.3" \ - org.opencontainers.image.revision="cl230320230319-1900" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="23.0.0.3" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" - -# Install WebSphere Liberty -ENV LIBERTY_VERSION 23.0.0_03 - -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -RUN yum -y install shadow-utils unzip wget findutils openssl \ - && yum clean all \ - && mkdir -p /licenses \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && LICENSE_BASE=$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*license:\s//p' | sed 's/\(.*\)\/.*/\1\//' | tr -d '\r') \ - && wget ${LICENSE_BASE}en.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/en.html \ - && wget ${LICENSE_BASE}non_ibm_license.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/non_ibm_license.html \ - && wget ${LICENSE_BASE}notices.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/notices.html \ - && echo "$EN_SHA /licenses/en.html" | sha256sum -c --strict --check \ - && echo "$NON_IBM_SHA /licenses/non_ibm_license.html" | sha256sum -c --strict --check \ - && echo "$NOTICES_SHA /licenses/notices.html" | sha256sum -c --strict --check \ - && chmod -R g+x /usr/bin \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && yum -y remove shadow-utils unzip wget \ - && yum clean all - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="23.0.0.3" \ - "BuildLabel"="cl230320230319-1900" - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea - -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# 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 \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8 deleted file mode 100644 index 73949c7f9..000000000 --- a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8 +++ /dev/null @@ -1,131 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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 icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true -ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f -ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f -ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="http://wasdev.net" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="23.0.0.3" \ - org.opencontainers.image.revision="cl230320230319-1900" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="23.0.0.3" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" - -# Install WebSphere Liberty -ENV LIBERTY_VERSION 23.0.0_03 - -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -RUN yum -y install shadow-utils unzip wget findutils openssl \ - && yum clean all \ - && mkdir -p /licenses \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && LICENSE_BASE=$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*license:\s//p' | sed 's/\(.*\)\/.*/\1\//' | tr -d '\r') \ - && wget ${LICENSE_BASE}en.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/en.html \ - && wget ${LICENSE_BASE}non_ibm_license.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/non_ibm_license.html \ - && wget ${LICENSE_BASE}notices.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/notices.html \ - && echo "$EN_SHA /licenses/en.html" | sha256sum -c --strict --check \ - && echo "$NON_IBM_SHA /licenses/non_ibm_license.html" | sha256sum -c --strict --check \ - && echo "$NOTICES_SHA /licenses/notices.html" | sha256sum -c --strict --check \ - && chmod -R g+x /usr/bin \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && yum -y remove shadow-utils unzip wget \ - && yum clean all - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="23.0.0.3" \ - "BuildLabel"="cl230320230319-1900" - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea - -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# 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 \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8 deleted file mode 100644 index 8353ae14a..000000000 --- a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8 +++ /dev/null @@ -1,129 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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 ibmjava:8-jre - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true -ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f -ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f -ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="http://wasdev.net" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="23.0.0.3" \ - org.opencontainers.image.revision="cl230320230319-1900" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" - -# Install WebSphere Liberty -ENV LIBERTY_VERSION 23.0.0_03 - -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -RUN apt-get update \ - && apt-get install -y --no-install-recommends unzip wget openssl \ - && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /licenses/ \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && LICENSE_BASE=$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*license:\s//p' | sed 's/\(.*\)\/.*/\1\//' | tr -d '\r') \ - && wget ${LICENSE_BASE}en.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/en.html \ - && wget ${LICENSE_BASE}non_ibm_license.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/non_ibm_license.html \ - && wget ${LICENSE_BASE}notices.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/notices.html \ - && echo "$EN_SHA /licenses/en.html" | sha256sum -c --strict --check \ - && echo "$NON_IBM_SHA /licenses/non_ibm_license.html" | sha256sum -c --strict --check \ - && echo "$NOTICES_SHA /licenses/notices.html" | sha256sum -c --strict --check \ - && apt-get purge --auto-remove -y unzip \ - && apt-get purge --auto-remove -y wget \ - && rm -rf /var/lib/apt/lists/* - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="23.0.0.3" \ - "BuildLabel"="cl230320230319-1900" - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea - -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# 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 \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk11 deleted file mode 100644 index 94f705de0..000000000 --- a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk11 +++ /dev/null @@ -1,129 +0,0 @@ -# (C) Copyright IBM Corporation 2020. -# -# 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 ibm-semeru-runtimes:open-11-jre-focal - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true -ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f -ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f -ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee - -LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="http://wasdev.net" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="23.0.0.3" \ - org.opencontainers.image.revision="cl230320230319-1900" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" - -# Install WebSphere Liberty -ENV LIBERTY_VERSION 23.0.0_03 - -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -RUN apt-get update \ - && apt-get install -y --no-install-recommends unzip wget openssl \ - && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /licenses/ \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && LICENSE_BASE=$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*license:\s//p' | sed 's/\(.*\)\/.*/\1\//' | tr -d '\r') \ - && wget ${LICENSE_BASE}en.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/en.html \ - && wget ${LICENSE_BASE}non_ibm_license.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/non_ibm_license.html \ - && wget ${LICENSE_BASE}notices.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/notices.html \ - && echo "$EN_SHA /licenses/en.html" | sha256sum -c --strict --check \ - && echo "$NON_IBM_SHA /licenses/non_ibm_license.html" | sha256sum -c --strict --check \ - && echo "$NOTICES_SHA /licenses/notices.html" | sha256sum -c --strict --check \ - && apt-get purge --auto-remove -y unzip \ - && apt-get purge --auto-remove -y wget \ - && rm -rf /var/lib/apt/lists/* - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="23.0.0.3" \ - "BuildLabel"="cl230320230319-1900" - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea - -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# 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 \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk17 deleted file mode 100644 index 280eb53af..000000000 --- a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk17 +++ /dev/null @@ -1,129 +0,0 @@ -# (C) Copyright IBM Corporation 2020. -# -# 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 ibm-semeru-runtimes:open-17-jre-focal - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true -ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f -ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f -ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee - -LABEL org.opencontainers.image.authors="Chris Potter, Christy Jesuraj, Melissa Lee" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="http://wasdev.net" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="23.0.0.3" \ - org.opencontainers.image.revision="cl230320230319-1900" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" - -# Install WebSphere Liberty -ENV LIBERTY_VERSION 23.0.0_03 - -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -RUN apt-get update \ - && apt-get install -y --no-install-recommends unzip wget openssl \ - && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /licenses/ \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && LICENSE_BASE=$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep $LIBERTY_VERSION -A 6 | sed -n 's/\s*license:\s//p' | sed 's/\(.*\)\/.*/\1\//' | tr -d '\r') \ - && wget ${LICENSE_BASE}en.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/en.html \ - && wget ${LICENSE_BASE}non_ibm_license.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/non_ibm_license.html \ - && wget ${LICENSE_BASE}notices.html -U UA-IBM-WebSphere-Liberty-Docker -O /licenses/notices.html \ - && echo "$EN_SHA /licenses/en.html" | sha256sum -c --strict --check \ - && echo "$NON_IBM_SHA /licenses/non_ibm_license.html" | sha256sum -c --strict --check \ - && echo "$NOTICES_SHA /licenses/notices.html" | sha256sum -c --strict --check \ - && apt-get purge --auto-remove -y unzip \ - && apt-get purge --auto-remove -y wget \ - && rm -rf /var/lib/apt/lists/* - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="23.0.0.3" \ - "BuildLabel"="cl230320230319-1900" - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea - -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# 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 \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.3/kernel/README.md b/ga/23.0.0.3/kernel/README.md deleted file mode 100644 index 32ce7911c..000000000 --- a/ga/23.0.0.3/kernel/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# WebSphere Application Server Developer Edition Liberty kernel image - -The [Dockerfile.ubuntu.ibmjava8](Dockerfile.ubuntu.ibmjava8) in this directory is used to build the `websphere-liberty:kernel` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). The image contains IBM WebSphere Application Server Developer Edition Liberty Kernel and an IBM Java Runtime Environment. - -# Usage - -Instructions for using the image can be found on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). It is possible to build the image yourself by cloning this repository, changing to the `ga//kernel` directory and then issuing the command to build container image. For example, with Docker execute `docker build .`. - -**Note:** Refer to [Optional Enterprise Functionality](https://github.com/WASdev/ci.docker#optional-enterprise-functionality) to ensure certain features are enabled such as monitoring or SSL. diff --git a/ga/23.0.0.3/kernel/fixes/.gitkeep b/ga/23.0.0.3/kernel/fixes/.gitkeep deleted file mode 100644 index a282fd264..000000000 --- a/ga/23.0.0.3/kernel/fixes/.gitkeep +++ /dev/null @@ -1,2 +0,0 @@ -Place holder file to keep the fixes directory -in git even if there aren't any current ifixes. diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-client.xml deleted file mode 100644 index 61dddfce0..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-client.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - true - - - true - - - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml deleted file mode 100644 index 4dd8f8063..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - true - - - - - - - - - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml deleted file mode 100644 index ce9fa0d76..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml deleted file mode 100644 index db8dc6a47..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - sessionCache-1.0 - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/http-endpoint.xml deleted file mode 100644 index 5f6c60552..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/http-endpoint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml deleted file mode 100644 index 2a2388a3c..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml deleted file mode 100644 index a5b7d8a0c..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml deleted file mode 100644 index f8fea3c88..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml deleted file mode 100644 index d835cb4e9..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml deleted file mode 100644 index e2ec72d2c..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - sessionCache-1.0 - - - - - - - - - - - - - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/jms-endpoint.xml deleted file mode 100644 index a99b07165..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/jms-endpoint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml deleted file mode 100644 index d32a77ce7..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/keystore.xml deleted file mode 100644 index d4872b5ce..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/keystore.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/mp-health-check.xml deleted file mode 100644 index 874559d63..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/mp-health-check.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - mpHealth-1.0 - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/mp-monitoring.xml deleted file mode 100644 index 4f5b0ce08..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/mp-monitoring.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - mpMetrics-1.1 - monitor-1.0 - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/oidc-config.xml deleted file mode 100644 index 976afbe4b..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/oidc-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/oidc.xml deleted file mode 100644 index f044723be..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/oidc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - openidConnectClient-1.0 - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sessioncache-features.xml deleted file mode 100644 index f7b5a4685..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sessioncache-features.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - sessionCache-1.0 - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-facebook.xml deleted file mode 100644 index 0c2d8aa42..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-facebook.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-features.xml deleted file mode 100644 index a26c00a58..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-features.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - appSecurity-2.0 - socialLogin-1.0 - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-github.xml deleted file mode 100644 index 1e96a50aa..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-github.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-google.xml deleted file mode 100644 index 50b40143f..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-google.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-linkedin.xml deleted file mode 100644 index f608d5cbb..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-linkedin.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-oauth2.xml deleted file mode 100644 index 783ce2d95..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-oauth2.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-oidc.xml deleted file mode 100644 index 530465305..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-oidc.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-twitter.xml deleted file mode 100644 index aedffbb50..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/sso-twitter.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/tls.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/tls.xml deleted file mode 100644 index 9d6838900..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/tls.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - transportSecurity-1.0 - - \ No newline at end of file diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/trustDefault.xml deleted file mode 100644 index 396987fad..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/trustDefault.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/truststore.xml deleted file mode 100644 index 3a32393d3..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configuration_snippets/truststore.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ga/23.0.0.3/kernel/helpers/build/configure.sh b/ga/23.0.0.3/kernel/helpers/build/configure.sh deleted file mode 100755 index b2480a5cd..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/configure.sh +++ /dev/null @@ -1,219 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020, 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. - -# Determine if featureUtility ran in an earlier build step -if /opt/ibm/helpers/build/internal/features-installed.sh; then - FEATURES_INSTALLED=true -else - FEATURES_INSTALLED=false -fi - -if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null -fi - -set -Eeox pipefail - -function main() { - ##Define variables for XML snippets source and target paths - WLP_INSTALL_DIR=/opt/ibm/wlp - SHARED_CONFIG_DIR=${WLP_INSTALL_DIR}/usr/shared/config - SHARED_RESOURCE_DIR=${WLP_INSTALL_DIR}/usr/shared/resources - - SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets - SNIPPETS_TARGET=/config/configDropins/overrides - SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults - mkdir -p ${SNIPPETS_TARGET} - mkdir -p ${SNIPPETS_TARGET_DEFAULTS} - - # Check for each Liberty value-add functionality - if [ "$FEATURES_INSTALLED" == "false" ]; then - # HTTP Endpoint - if [ "$HTTP_ENDPOINT" == "true" ]; then - if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/http-ssl-endpoint.xml $SNIPPETS_TARGET/http-ssl-endpoint.xml - else - cp $SNIPPETS_SOURCE/http-endpoint.xml $SNIPPETS_TARGET/http-endpoint.xml - fi - fi - - # MicroProfile Health - if [ "$MP_HEALTH_CHECK" == "true" ]; then - cp $SNIPPETS_SOURCE/mp-health-check.xml $SNIPPETS_TARGET/mp-health-check.xml - fi - - # MicroProfile Monitoring - if [ "$MP_MONITORING" == "true" ]; then - cp $SNIPPETS_SOURCE/mp-monitoring.xml $SNIPPETS_TARGET/mp-monitoring.xml - fi - - # IIOP Endpoint - if [ "$IIOP_ENDPOINT" == "true" ]; then - if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/iiop-ssl-endpoint.xml $SNIPPETS_TARGET/iiop-ssl-endpoint.xml - else - cp $SNIPPETS_SOURCE/iiop-endpoint.xml $SNIPPETS_TARGET/iiop-endpoint.xml - fi - fi - - # JMS Endpoint - if [ "$JMS_ENDPOINT" == "true" ]; then - if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/jms-ssl-endpoint.xml $SNIPPETS_TARGET/jms-ssl-endpoint.xml - else - cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml - fi - fi - - # OpenIdConnect Client - if [ "$OIDC" == "true" ] || [ "$OIDC_CONFIG" == "true" ]; then - cp $SNIPPETS_SOURCE/oidc.xml $SNIPPETS_TARGET/oidc.xml - fi - if [ "$OIDC_CONFIG" == "true" ]; then - cp $SNIPPETS_SOURCE/oidc-config.xml $SNIPPETS_TARGET/oidc-config.xml - fi - - # Infinispan Session Caching (Full) - if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then - cp ${SNIPPETS_SOURCE}/infinispan-client-sessioncache.xml ${SNIPPETS_TARGET}/infinispan-client-sessioncache.xml - chmod g+rw $SNIPPETS_TARGET/infinispan-client-sessioncache.xml - fi - - # Hazelcast Session Caching (Full) - if [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then - cp ${SNIPPETS_SOURCE}/hazelcast-sessioncache.xml ${SNIPPETS_TARGET}/hazelcast-sessioncache.xml - mkdir -p ${SHARED_CONFIG_DIR}/hazelcast - cp ${SNIPPETS_SOURCE}/hazelcast-${HZ_SESSION_CACHE}.xml ${SHARED_CONFIG_DIR}/hazelcast/hazelcast.xml - fi - - # SSO - if [[ -n "$SEC_SSO_PROVIDERS" ]]; then - cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS - fi - - # Key Store - if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/tls.xml $SNIPPETS_TARGET/tls.xml - fi - else - # Otherwise, load XML for addons that have features already installed - # Infinispan Session Caching - if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then - cp ${SNIPPETS_SOURCE}/infinispan-client-sessioncache-config.xml ${SNIPPETS_TARGET}/infinispan-client-sessioncache-config.xml - chmod g+rw $SNIPPETS_TARGET/infinispan-client-sessioncache-config.xml - fi - - # Hazelcast Session Caching - if [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then - cp ${SNIPPETS_SOURCE}/hazelcast-sessioncache-config.xml ${SNIPPETS_TARGET}/hazelcast-sessioncache-config.xml - mkdir -p ${SHARED_CONFIG_DIR}/hazelcast - cp ${SNIPPETS_SOURCE}/hazelcast-${HZ_SESSION_CACHE}.xml ${SHARED_CONFIG_DIR}/hazelcast/hazelcast.xml - fi - fi - - # Key Store - keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml" - if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then - if [ ! -e $keystorePath ]; then - # Generate the keystore.xml - export KEYSTOREPWD=$(openssl rand -base64 32) - sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml - chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml - fi - fi - - # SSO - if [[ -n "$SEC_SSO_PROVIDERS" ]]; then - parseProviders $SEC_SSO_PROVIDERS - fi - - if [ "$SKIP_FEATURE_INSTALL" != "true" ] && [ "$FEATURES_INSTALLED" == "false" ]; then - # Install needed features - if [ "$FEATURE_REPO_URL" ]; then - curl -k --fail $FEATURE_REPO_URL > /tmp/repo.zip - installUtility install --acceptLicense defaultServer --from=/tmp/repo.zip || rc=$?; if [ $rc -ne 22 ]; then exit $rc; fi - rm -rf /tmp/repo.zip - else - installUtility install --acceptLicense defaultServer || rc=$?; if [ $rc -ne 22 ]; then exit $rc; fi - fi - fi - - # Apply interim fixes found in /opt/ibm/fixes - # Fixes recommended by IBM, such as to resolve security vulnerabilities, are also included in /opt/ibm/fixes - # Note: This step should be done once needed features are enabled and installed using installUtility. - - # Do not create a SCC - if [ -n "${IBM_JAVA_OPTIONS}" ]; then - IBM_JAVA_OPTIONS="${IBM_JAVA_OPTIONS} -Xshareclasses:none" - fi - - if [ -n "${OPENJ9_JAVA_OPTIONS}" ]; then - OPENJ9_JAVA_OPTIONS="${OPENJ9_JAVA_OPTIONS} -Xshareclasses:none" - fi - - find /opt/ibm/fixes -type f -name "*.jar" -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation $WLP_INSTALL_DIR - #Make sure that group write permissions are set correctly after installing new features - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw - - # Create a new SCC layer - if [ "$OPENJ9_SCC" == "true" ]; then - cmd="populate_scc.sh -i 1" - if [ "$TRIM_SCC" == "false" ]; then - cmd+=" -d" - fi - if [ ! "$SCC_SIZE" = "" ]; then - cmd+=" -s $SCC_SIZE" - fi - eval $cmd - fi -} - -## parse provider list to generate files into configDropins -function parseProviders() { - while [ $# -gt 0 ]; do - case "$1" in - oidc:*) - parseCommaList oidc "${1#*:}" - ;; - oauth2:*) - parseCommaList oauth2 "${1#*:}" - ;; - *) - if [[ $(ls $SNIPPETS_SOURCE | grep "$1") ]]; then - cp $SNIPPETS_SOURCE/sso-${1}.xml $SNIPPETS_TARGET_DEFAULTS - fi - ;; - esac - shift - done -} - -## process the comma delimitted oauth2/oidc source lists -function parseCommaList() { - local type="$1" - local list=$(echo "$2" | tr , " ") - - for current in ${list}; do - if [[ "${type}" = "oidc" ]]; then - # replace oidc identifiers with custom name - sed -e 's/=\"oidc/=\"'${current}'/g' -e 's/_OIDC_/_'${current^^}'_/g' $SNIPPETS_SOURCE/sso-oidc.xml > $SNIPPETS_TARGET_DEFAULTS/sso-${current}.xml - else - # replace oauth2 identifiers with custom name - sed -e 's/=\"oauth2/=\"'${current}'/g' -e 's/_OAUTH2_/_'${current^^}'_/g' $SNIPPETS_SOURCE/sso-oauth2.xml > $SNIPPETS_TARGET_DEFAULTS/sso-${current}.xml - fi - done -} - -main "$@" diff --git a/ga/23.0.0.3/kernel/helpers/build/features.sh b/ga/23.0.0.3/kernel/helpers/build/features.sh deleted file mode 100755 index 4e6654898..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/features.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# (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. -if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null -fi - -set -Eeox pipefail - -##Define variables for XML snippets source and target paths -SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets -SNIPPETS_TARGET=/config/configDropins/overrides -SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults -mkdir -p ${SNIPPETS_TARGET} -mkdir -p ${SNIPPETS_TARGET_DEFAULTS} - -# Session Caching -if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then - cp ${SNIPPETS_SOURCE}/sessioncache-features.xml ${SNIPPETS_TARGET}/sessioncache-features.xml - chmod g+rw $SNIPPETS_TARGET/sessioncache-features.xml -fi - -# SSO -if [[ -n "$SEC_SSO_PROVIDERS" ]]; then - cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS -fi - -# Key Store -if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/tls.xml $SNIPPETS_TARGET/tls.xml -fi - -# Install necessary features using featureUtility -featureUtility installServerFeatures --acceptLicense defaultServer --noCache -find /opt/ibm/wlp/lib /opt/ibm/wlp/bin ! -perm -g=rw -print0 | xargs -0 -r chmod g+rw - -echo "features.sh script has been run" > /logs/features.log diff --git a/ga/23.0.0.3/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.3/kernel/helpers/build/infinispan-client-setup.sh deleted file mode 100755 index cf54d05df..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/infinispan-client-setup.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020. -# -# 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. -if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null -fi - -set -Eeox pipefail - -yum update -y -yum install -y maven -mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan -echo ' 4.0.0 io.openliberty openliberty-infinispan-client 1.0 org.infinispan infinispan-jcache-remote 10.1.3.Final ' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml -mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false -mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan -yum remove -y maven -rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml -rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/jboss-transaction-api*.jar -rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/reactive-streams-*.jar -rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/rxjava-*.jar -rm -rf ~/.m2 -chown -R 1001:0 /opt/ibm/wlp/usr/shared/resources/infinispan -chmod -R g+rw /opt/ibm/wlp/usr/shared/resources/infinispan - diff --git a/ga/23.0.0.3/kernel/helpers/build/internal/features-installed.sh b/ga/23.0.0.3/kernel/helpers/build/internal/features-installed.sh deleted file mode 100755 index c32ac59f4..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/internal/features-installed.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ -f "/logs/features.log" ]; then - rm /logs/features.log - exit 0 -fi - ->&2 echo "WARNING: This is not an optimal build configuration. Although features in server.xml will continue to be installed correctly, the 'RUN features.sh' command should be added to the Dockerfile prior to configure.sh. See https://ibm.biz/wl-app-image-template for a sample application image template." -exit 1 diff --git a/ga/23.0.0.3/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.3/kernel/helpers/build/populate_scc.sh deleted file mode 100755 index 3c07a4e92..000000000 --- a/ga/23.0.0.3/kernel/helpers/build/populate_scc.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020. -# -# 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. -if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null -fi - -set -Eeox pipefail - -# 32-bit JVMs don't supported multi-layered SCCs. -[ -e "$JAVA_HOME/lib/i386" -o -e "$JAVA_HOME/lib/ppc" -o -e "$JAVA_HOME/lib/s390" ] && exit 0 - -SCC_SIZE="80m" # Default size of the SCC layer. -ITERATIONS=2 # Number of iterations to run to populate it. -TRIM_SCC=yes # Trim the SCC to eliminate any wasted space. - -# If this directory exists and has at least ug=rwx permissions, assume the base image includes an SCC called 'openj9_system_scc' and build on it. -# If not, build on our own SCC. -if [[ -d "/opt/java/.scc" ]] && [[ `stat -L -c "%a" "/opt/java/.scc" | cut -c 1,2` == "77" ]] -then - SCC="-Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc" -else - SCC="-Xshareclasses:name=liberty,cacheDir=/output/.classCache" -fi - -# For JDK8, as of OpenJ9 0.20.0 the criteria for determining the max heap size (-Xmx) has changed -# and the JVM has freedom to choose larger max heap sizes. -# Currently in compressedrefs mode there is a dependency between heap size and position and the AOT code stored in the -# SCC, such that if the max heap size/position changes too drastically the AOT code in the SCC becomes invalid and will -# not be loaded. Also, new AOT code will not be generated. -# In order to reduce the chances of this happening we use the -XX:+OriginalJDK8HeapSizeCompatibilityMode -# option to revert to the old criteria, which results in AOT code that is more compatible, on average, with typical heap sizes/positions. -# The option has no effect on later JDKs. -export OPENJ9_JAVA_OPTIONS="-XX:+OriginalJDK8HeapSizeCompatibilityMode $SCC" -export IBM_JAVA_OPTIONS="$OPENJ9_JAVA_OPTIONS" -CREATE_LAYER="$OPENJ9_JAVA_OPTIONS,createLayer,groupAccess" -DESTROY_LAYER="$OPENJ9_JAVA_OPTIONS,destroy" -PRINT_LAYER_STATS="$OPENJ9_JAVA_OPTIONS,printTopLayerStats" - -while getopts ":i:s:tdh" OPT -do - case "$OPT" in - i) - ITERATIONS="$OPTARG" - ;; - s) - [ "${OPTARG: -1}" == "m" ] || ( echo "Missing m suffix." && exit 1 ) - SCC_SIZE="$OPTARG" - ;; - t) - TRIM_SCC=yes - ;; - d) - TRIM_SCC=no - ;; - h) - echo \ -"Usage: $0 [-i iterations] [-s size] [-t] [-d] - -i Number of iterations to run to populate the SCC. (Default: $ITERATIONS) - -s Size of the SCC in megabytes (m suffix required). (Default: $SCC_SIZE) - -t Trim the SCC to eliminate most of the free space, if any. - -d Don't trim the SCC. - - Trimming enabled=$TRIM_SCC" - exit 1 - ;; - \?) - echo "Unrecognized option: $OPTARG" 1>&2 - exit 1 - ;; - :) - echo "Missing argument for option: $OPTARG" 1>&2 - exit 1 - ;; - esac -done - -OLD_UMASK=`umask` -umask 002 # 002 is required to provide group rw permission to the cache when `-Xshareclasses:groupAccess` options is used - -# Explicity create a class cache layer for this image layer here rather than allowing -# `server start` to do it, which will lead to problems because multiple JVMs will be started. -java $CREATE_LAYER -Xscmx$SCC_SIZE -version - -if [ $TRIM_SCC == yes ] -then - echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." - # Populate the newly created class cache layer. - /opt/ibm/wlp/bin/server start - /opt/ibm/wlp/bin/server stop - # Find out how full it is. - FULL=`( java $PRINT_LAYER_STATS || true ) 2>&1 | awk '/^Cache is [0-9.]*% .*full/ {print substr($3, 1, length($3)-1)}'` - echo "SCC layer is $FULL% full. Destroying layer." - # Destroy the layer once we know roughly how much space we need. - java $DESTROY_LAYER || true - # Remove the m suffix. - SCC_SIZE="${SCC_SIZE:0:-1}" - # Calculate the new size based on how full the layer was (rounded to nearest m). - SCC_SIZE=`awk "BEGIN {print int($SCC_SIZE * $FULL / 100.0 + 0.5)}"` - # Make sure size is >0. - [ $SCC_SIZE -eq 0 ] && SCC_SIZE=1 - # Add the m suffix back. - SCC_SIZE="${SCC_SIZE}m" - echo "Re-creating layer with size $SCC_SIZE." - # Recreate the layer with the new size. - java $CREATE_LAYER -Xscmx$SCC_SIZE -version -fi - -# Populate the newly created class cache layer. -# Server start/stop to populate the /output/workarea and make subsequent server starts faster. -for ((i=0; i<$ITERATIONS; i++)) -do - /opt/ibm/wlp/bin/server start - /opt/ibm/wlp/bin/server stop -done - -# restore umask -umask ${OLD_UMASK} - -rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /output/workarea - -if [[ -d "/output/resources" ]] -then - chmod -R g+rwx /output/resources -fi - -# Tell the user how full the final layer is. -FULL=`( java $PRINT_LAYER_STATS || true ) 2>&1 | awk '/^Cache is [0-9.]*% .*full/ {print substr($3, 1, length($3)-1)}'` -echo "SCC layer is $FULL% full." diff --git a/ga/23.0.0.3/kernel/helpers/runtime/docker-server.sh b/ga/23.0.0.3/kernel/helpers/runtime/docker-server.sh deleted file mode 100755 index bc62e4d41..000000000 --- a/ga/23.0.0.3/kernel/helpers/runtime/docker-server.sh +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020. -# -# 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. - -function importKeyCert() { - local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}" - local CRT_FILE="tls.crt" - local KEY_FILE="tls.key" - local CA_FILE="ca.crt" - local PASSWORD=$(openssl rand -base64 32 2>/dev/null) - local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null) - local TMP_CERT=ca-bundle-temp.crt - local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/" - local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount" - local KEYSTORE_FILE="/output/resources/security/key.p12" - local TRUSTSTORE_FILE="/output/resources/security/trust.p12" - - # Import the private key and certificate into new keytore - if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then - echo "Found mounted TLS certificates, generating keystore" - mkdir -p /output/resources/security - if [ -f "${CERT_FOLDER}/${CA_FILE}" ]; then - openssl pkcs12 -export \ - -name "defaultKeyStore" \ - -inkey "${CERT_FOLDER}/${KEY_FILE}" \ - -in "${CERT_FOLDER}/${CRT_FILE}" \ - -certfile "${CERT_FOLDER}/${CA_FILE}" \ - -out "${KEYSTORE_FILE}" \ - -password pass:"${PASSWORD}" >&/dev/null - else - openssl pkcs12 -export \ - -name "defaultKeyStore" \ - -inkey "${CERT_FOLDER}/${KEY_FILE}" \ - -in "${CERT_FOLDER}/${CRT_FILE}" \ - -out "${KEYSTORE_FILE}" \ - -password pass:"${PASSWORD}" >&/dev/null - fi - - # Since we are creating new keystore, always write new password to a file - sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml - - # Add mounted CA to the truststore - if [ -f "${CERT_FOLDER}/${CA_FILE}" ]; then - echo "Found mounted TLS CA certificate, adding to truststore" - keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FOLDER}/${CA_FILE}" \ - -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-ca" >&/dev/null - fi - fi - - # Add kubernetes CA certificates to the truststore - # CA bundles need to be split and added as individual certificates - if [ "$SEC_IMPORT_K8S_CERTS" = "true" ] && [ -d "${KUBE_SA_FOLDER}" ]; then - mkdir /tmp/certs - pushd /tmp/certs >&/dev/null - cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT} - csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}' - for CERT_FILE in crt-*; do - keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \ - -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null - done - popd >&/dev/null - rm -rf /tmp/certs - fi - - # Add the keystore password to server configuration - if [ ! -e $keystorePath ]; then - sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml - fi - if [ -e $TRUSTSTORE_FILE ]; then - sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml - elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then - cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml - fi -} - -case "${LICENSE,,}" in - "accept" ) # Suppress license message in logs - grep -s -F "com.ibm.ws.logging.hideMessage" /config/bootstrap.properties \ - && sed -i 's/^\(com.ibm.ws.logging.hideMessage=.*$\)/\1,CWWKE0100I/' /config/bootstrap.properties \ - || echo "com.ibm.ws.logging.hideMessage=CWWKE0100I" >> /config/bootstrap.properties - ;; - "view" ) # Display license file - cat /opt/ibm/wlp/lafiles/LI_${LANG:-en} - exit 1 - ;; - "" ) # Continue, displaying license message in logs - true - ;; - *) # License not accepted - echo -e "Set environment variable LICENSE=accept to indicate acceptance of license terms and conditions.\n\nLicense agreements and information can be viewed by running this image with the environment variable LICENSE=view. You can also set the LANG environment variable to view the license in a different language." - exit 1 - ;; -esac - -SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets -SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults -SNIPPETS_TARGET_OVERRIDES=/config/configDropins/overrides - -keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml" - -importKeyCert - -# Infinispan Session Caching -if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then - echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}" - INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g') - echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}" - - if [[ -z "$INFINISPAN_HOST" ]]; then - eval INFINISPAN_HOST=\$${INFINISPAN_SERVICE_NAME}_SERVICE_HOST - export INFINISPAN_HOST - fi - echo "INFINISPAN_HOST: ${INFINISPAN_HOST}" - - if [[ -z "$INFINISPAN_PORT" ]]; then - eval INFINISPAN_PORT=\$${INFINISPAN_SERVICE_NAME}_SERVICE_PORT - export INFINISPAN_PORT - fi - echo "INFINISPAN_PORT: ${INFINISPAN_PORT:=11222}" - - if [[ -z "$INFINISPAN_USER" ]]; then - export INFINISPAN_USER=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 username | sed 's/username://' | sed 's/[[:space:]]*//g' | sed 's/^-//') - fi - echo "INFINISPAN_USER: ${INFINISPAN_USER:=developer}" - - if [[ -z "$INFINISPAN_PASS" ]]; then - export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g') - fi - echo "INFINISPAN_PASS: ${INFINISPAN_PASS}" -fi - - -# Pass on to the real server run -exec "$@" diff --git a/ga/23.0.0.3/oidcProvider/Dockerfile b/ga/23.0.0.3/oidcProvider/Dockerfile deleted file mode 100644 index 5d13b61fb..000000000 --- a/ga/23.0.0.3/oidcProvider/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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:kernel - -ARG REPOSITORIES_PROPERTIES="" - -RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \ - && echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; fi \ - && installUtility install --acceptLicense \ - appSecurity-2.0 ldapRegistry-3.0 \ - localConnector-1.0 \ - samlWeb-2.0 \ - openidConnectServer-1.0 \ - socialLogin-1.0 \ - openidConnectClient-1.0 \ - && if [ ! -z $REPOSITORIES_PROPERTIES ]; then rm /opt/ibm/wlp/etc/repositories.properties; fi \ - && rm -rf /output/workarea /output/logs \ - && chmod -R g+rwx /opt/ibm/wlp/output/* - -COPY --chown=1001:0 server.xml /config/ diff --git a/ga/23.0.0.3/oidcProvider/Dockerfile.java11 b/ga/23.0.0.3/oidcProvider/Dockerfile.java11 deleted file mode 100644 index 20a2f5320..000000000 --- a/ga/23.0.0.3/oidcProvider/Dockerfile.java11 +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2019. -# -# 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:kernel-java11 - -ARG REPOSITORIES_PROPERTIES="" - -RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \ - && echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; fi \ - && installUtility install --acceptLicense \ - appSecurity-2.0 ldapRegistry-3.0 \ - localConnector-1.0 \ - samlWeb-2.0 \ - openidConnectServer-1.0 \ - socialLogin-1.0 \ - openidConnectClient-1.0 \ - && if [ ! -z $REPOSITORIES_PROPERTIES ]; then rm /opt/ibm/wlp/etc/repositories.properties; fi \ - && rm -rf /output/workarea /output/logs \ - && chmod -R g+rwx /opt/ibm/wlp/output/* - -COPY --chown=1001:0 server.xml /config/ diff --git a/ga/23.0.0.3/oidcProvider/README.md b/ga/23.0.0.3/oidcProvider/README.md deleted file mode 100644 index 52d2c87f5..000000000 --- a/ga/23.0.0.3/oidcProvider/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# WebSphere Application Server Developer Edition Liberty image - -The [Dockerfile](Dockerfile) in this directory is used to build the `websphere-liberty:oidcProvider` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). - -# Usage - -TODO diff --git a/ga/23.0.0.3/oidcProvider/server.xml b/ga/23.0.0.3/oidcProvider/server.xml deleted file mode 100644 index 5b94ec95b..000000000 --- a/ga/23.0.0.3/oidcProvider/server.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - openidConnectServer-1.0 - ldapRegistry-3.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - regexp:https://${env.OIDCP_INGRESS_HOST_REGEX}:3!d!d!d!d/oidcclient/redirect/rp - https://${env.OIDCP_INGRESS_HOST}/oidcclient/redirect/rp - - - - ${env.OIDCP_CUSTOM_CLIENT_REDIRECT} - - - - - - - - - - - - - - - - - - - - - - - - - - - From c7a284f0122f04976c2bc870e2cd57e5b68445ed Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 5 Sep 2023 10:40:35 -0700 Subject: [PATCH 3/3] PARENT_IMAGE needs version --- ga/23.0.0.9/full/Dockerfile.ubi.ibmjava8 | 4 ++-- ga/23.0.0.9/full/Dockerfile.ubi.openjdk11 | 4 ++-- ga/23.0.0.9/full/Dockerfile.ubi.openjdk17 | 4 ++-- ga/23.0.0.9/full/Dockerfile.ubi.openjdk8 | 4 ++-- ga/23.0.0.9/full/Dockerfile.ubuntu.ibmjava8 | 2 +- ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 | 2 +- ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ga/23.0.0.9/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.9/full/Dockerfile.ubi.ibmjava8 index 8323de579..814ac1963 100644 --- a/ga/23.0.0.9/full/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.9/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:kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.9-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:kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.9-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.9/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.9/full/Dockerfile.ubi.openjdk11 index 8669e3adf..248d86f67 100644 --- a/ga/23.0.0.9/full/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.9/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:kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.9-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:kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.9-kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.9/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.9/full/Dockerfile.ubi.openjdk17 index e38227406..c5d30fa43 100644 --- a/ga/23.0.0.9/full/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.9/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:kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.9-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:kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.9-kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.9/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.9/full/Dockerfile.ubi.openjdk8 index 0081f5719..75f471ca7 100644 --- a/ga/23.0.0.9/full/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.9/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:kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.9-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:kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.9-kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.9/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.9/full/Dockerfile.ubuntu.ibmjava8 index c301dfec2..93af24dad 100644 --- a/ga/23.0.0.9/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.9/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:kernel-java8-ibmjava +FROM websphere-liberty:23.0.0.9-kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 index 305136390..ece432c9a 100644 --- a/ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.9/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:kernel-java11-openj9 +FROM websphere-liberty:23.0.0.9-kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 index 58d75c5a0..dfc6cba20 100644 --- a/ga/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.9/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:kernel-java17-openj9 +FROM websphere-liberty:23.0.0.9-kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES=""