From d325a6438d953ca3f9942048d370208e8cb821d1 Mon Sep 17 00:00:00 2001 From: Kevin Ortega Date: Wed, 17 Jul 2024 10:11:22 -0400 Subject: [PATCH 1/2] Updates for WLP 24.0.0.7 --- .one-pipeline.yaml | 2 +- Makefile | 2 +- build.sh | 3 --- modules/java21/module.yaml | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.one-pipeline.yaml b/.one-pipeline.yaml index 9756862..d391fa9 100644 --- a/.one-pipeline.yaml +++ b/.one-pipeline.yaml @@ -7,7 +7,7 @@ setup: set_env S2I_URI "https://api.github.com/repos/openshift/source-to-image/releases/tags/v1.3.9" set_env CEKIT_VERSION "4.9.1" - set_env LIBERTY_VERSION "24.0.0.6" + set_env LIBERTY_VERSION "24.0.0.7" test: abort_on_failure: false diff --git a/Makefile b/Makefile index 1b38d41..fe6c397 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -LIBERTY_VERSION=24.0.0.6 +LIBERTY_VERSION=24.0.0.7 JAVA8_IMAGE_VERSION=$(LIBERTY_VERSION)-java8 JAVA8_RUNTIME_IMAGE_VERSION=$(LIBERTY_VERSION)-runtime-java8 JAVA11_IMAGE_VERSION=$(LIBERTY_VERSION)-java11 diff --git a/build.sh b/build.sh index 282a8e6..355d7b2 100755 --- a/build.sh +++ b/build.sh @@ -6,9 +6,6 @@ JAVA11_BASE_IMAGE_NAME="${NAMESPACE:=icr.io}/appcafe/websphere-liberty:${LIBERTY JAVA17_BASE_IMAGE_NAME="${NAMESPACE:=icr.io}/appcafe/websphere-liberty:${LIBERTY_VERSION}-full-java17-openj9-ubi" JAVA21_BASE_IMAGE_NAME="${NAMESPACE:=icr.io}/appcafe/websphere-liberty:${LIBERTY_VERSION}-full-java21-openj9-ubi-minimal" -#echo "Temp fix to add maven to cekit cache because module is not downloading in 1Pipeline" -#cekit-cache add ${SCRIPT_DIR}/prereqs/maven/maven.tar.gz --sha512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00 - echo "Building Java 8 Builder Image ${JAVA8_BASE_IMAGE_NAME}" pushd ${SCRIPT_DIR}/images/java8/builder cekit build --overrides '{"from": "'"${JAVA8_BASE_IMAGE_NAME}"'"}' --overrides '{"version": "'"${JAVA8_IMAGE_VERSION}"'"}' --overrides '{"name": "'"${PROD_NAMESPACE:=ibmcom}/websphere-liberty-s2i"'"}' docker diff --git a/modules/java21/module.yaml b/modules/java21/module.yaml index 40e0559..4101ef0 100644 --- a/modules/java21/module.yaml +++ b/modules/java21/module.yaml @@ -7,7 +7,7 @@ description: "Module used to install IBM Semeru Java 21" # Defined artifacts that are used to build the image artifacts: - name: semeru21.tar.gz - url: https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.2%2B13_openj9-0.43.0/ibm-semeru-open-jdk_x64_linux_21.0.2_13_openj9-0.43.0.tar.gz - sha256: 7a7a186a7a48537519917331ec91d9180b961dcc7ea0f627a23fa369edab6f16 + url: https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3+9_openj9-0.44.0/ibm-semeru-open-jdk_x64_linux_21.0.3_9_openj9-0.44.0.tar.gz + sha256: 5cccb39dc7ca6c61a11bd7179c4c3c30b747f9f22129576feef921b59725af25 execute: - script: install.sh From 9a8505f16ee3b902d15132f12f09e2f3b59854cf Mon Sep 17 00:00:00 2001 From: Kevin Ortega Date: Wed, 17 Jul 2024 10:39:15 -0400 Subject: [PATCH 2/2] Update java path/home --- images/java21/builder/image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/java21/builder/image.yaml b/images/java21/builder/image.yaml index b025c3f..dc239ca 100644 --- a/images/java21/builder/image.yaml +++ b/images/java21/builder/image.yaml @@ -28,9 +28,9 @@ envs: - name: S2I_DESTINATION value: "/tmp" - name: JAVA_HOME - value: /usr/local/jdk-21.0.2+13 + value: /usr/local/jdk-21.0.3+9 - name: PATH - value: /usr/local/jdk-21.0.2+13/bin:$PATH + value: /usr/local/jdk-21.0.3+9/bin:$PATH packages: manager: microdnf