From 9d5b529f033a7952ad416e477faa17b7ad57c771 Mon Sep 17 00:00:00 2001 From: Kevin Ortega Date: Tue, 23 Apr 2024 13:26:03 -0400 Subject: [PATCH 1/5] Update for WLP 24.0.0.4 and Java 21 --- images/java21/builder/image.yaml | 4 ++-- modules/java21/module.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/java21/builder/image.yaml b/images/java21/builder/image.yaml index 8c9c5e0..b025c3f 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.1+12 + value: /usr/local/jdk-21.0.2+13 - name: PATH - value: /usr/local/jdk-21.0.1+12/bin:$PATH + value: /usr/local/jdk-21.0.2+13/bin:$PATH packages: manager: microdnf diff --git a/modules/java21/module.yaml b/modules/java21/module.yaml index fd0cf07..40e0559 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.1%2B12_openj9-0.42.0/ibm-semeru-open-jdk_x64_linux_21.0.1_12_openj9-0.42.0.tar.gz - sha256: ad575bc4b1fa9e9fa56661444b6153abfa147ec155845afa054472fa6357f026 + 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 execute: - script: install.sh From 2b7d15611addc7aa3b8f8d71efb1e7395ff4953d Mon Sep 17 00:00:00 2001 From: Kevin Ortega Date: Wed, 22 May 2024 11:17:14 -0400 Subject: [PATCH 2/5] Updates for WebSphere Liberty 24.0.0.5 --- .one-pipeline.yaml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.one-pipeline.yaml b/.one-pipeline.yaml index 240fd6c..e87c7dc 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.4" + set_env LIBERTY_VERSION "24.0.0.5" test: abort_on_failure: false diff --git a/Makefile b/Makefile index 83eefe4..0df685d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -LIBERTY_VERSION=24.0.0.4 +LIBERTY_VERSION=24.0.0.5 JAVA8_IMAGE_VERSION=$(LIBERTY_VERSION)-java8 JAVA8_RUNTIME_IMAGE_VERSION=$(LIBERTY_VERSION)-runtime-java8 JAVA11_IMAGE_VERSION=$(LIBERTY_VERSION)-java11 From 8bc964157d2e49d06f7ce5630f39c2c20f4f269f Mon Sep 17 00:00:00 2001 From: Kevin Ortega Date: Wed, 22 May 2024 11:41:47 -0400 Subject: [PATCH 3/5] Pin requests <2.32.0 --- .github/workflows/deploy.yaml | 2 +- .github/workflows/main.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 458d87a..ecf6175 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -38,7 +38,7 @@ jobs: mkdir ~/cekit${{ env.CEKIT_VERSION }} virtualenv ~/cekit${{ env.CEKIT_VERSION }} . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate - pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 + pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 requests<2.32.0 - name: install s2i binary run: | echo ===== Installing s2i from ${{ env.S2I_URL }} ===== diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1d12fdb..36aca33 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -52,7 +52,7 @@ jobs: mkdir ~/cekit${{ env.CEKIT_VERSION }} python3 -m venv ~/cekit${{ env.CEKIT_VERSION }} . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate - pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 + pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 requests<2.32.0 - name: install s2i binary run: | echo ===== Installing s2i from ${{ env.S2I_URL }} ===== From 0c907d21d5b94811be56cb7143a068336eef3631 Mon Sep 17 00:00:00 2001 From: Kevin Ortega Date: Wed, 22 May 2024 11:53:50 -0400 Subject: [PATCH 4/5] Pin requests < 2.32.0 --- .github/workflows/deploy.yaml | 2 +- .github/workflows/main.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index ecf6175..2e9dcd5 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -38,7 +38,7 @@ jobs: mkdir ~/cekit${{ env.CEKIT_VERSION }} virtualenv ~/cekit${{ env.CEKIT_VERSION }} . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate - pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 requests<2.32.0 + pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 request==2.31.0 - name: install s2i binary run: | echo ===== Installing s2i from ${{ env.S2I_URL }} ===== diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 36aca33..ec3adc2 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -52,7 +52,7 @@ jobs: mkdir ~/cekit${{ env.CEKIT_VERSION }} python3 -m venv ~/cekit${{ env.CEKIT_VERSION }} . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate - pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 requests<2.32.0 + pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3 requests==2.31.0 - name: install s2i binary run: | echo ===== Installing s2i from ${{ env.S2I_URL }} ===== From 4406b7dbe1cc76ea1d45a4631fbc97aa7531b0e1 Mon Sep 17 00:00:00 2001 From: Kevin Ortega Date: Wed, 22 May 2024 12:15:31 -0400 Subject: [PATCH 5/5] pin requests to 2.31.0 for onepipeline --- .one-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.one-pipeline.yaml b/.one-pipeline.yaml index e87c7dc..5bd9c71 100644 --- a/.one-pipeline.yaml +++ b/.one-pipeline.yaml @@ -94,7 +94,7 @@ containerize: mkdir ~/cekit${CEKIT_VERSION} python3 -m venv ~/cekit${CEKIT_VERSION} pip3 install --upgrade pip - pip3 install cekit==${CEKIT_VERSION} docker==5.0.3 docker-squash odcs behave lxml setuptools_rust urllib3==1.26.15 packaging==21.3 + pip3 install cekit==${CEKIT_VERSION} docker==5.0.3 docker-squash odcs behave lxml setuptools_rust urllib3==1.26.15 packaging==21.3 requests==2.31.0 . ~/cekit${CEKIT_VERSION}/bin/activate echo "***** Installed CEKIT version ${CEKIT_VERSION} *****" cekit --version