Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for WLP 24.0.0.7 #72

Merged
merged 2 commits into from
Jul 17, 2024
Merged

Updates for WLP 24.0.0.7 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d325a64
Updates for WLP 24.0.0.7
kevin-ortega Jul 17, 2024
9a8505f
Update java path/home
kevin-ortega Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .one-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions images/java21/builder/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions modules/java21/module.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading