Skip to content

[OPENJDK-3419] Initial changes for JDK11-ELS images #516

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

Merged
merged 1 commit into from
Nov 8, 2024
Merged

[OPENJDK-3419] Initial changes for JDK11-ELS images #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/image-workflow-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: clear docker credentials
run: docker logout

- name: Behave Tests
run: |
echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
# - name: Behave Tests
# run: |
# echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
# cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
4 changes: 2 additions & 2 deletions .github/workflows/ubi9-openjdk-11.yml → .github/workflows/openjdk-11-rhel9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: UBI9 OpenJDK 11 S2I Image CI
on: [push, pull_request]
env:
LANG: en_US.UTF-8
IMAGE: ubi9-openjdk-11
IMAGE: openjdk-11-rhel-9
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would seem this PR proves that this env var definition here is not in use.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very true!

jobs:
call-openjdkci:
uses: ./.github/workflows/image-workflow-template.yml
with:
image: ubi9-openjdk-11
image: openjdk-11-rhel9
4 changes: 2 additions & 2 deletions ...hub/workflows/ubi9-openjdk-11-runtime.yml → ...b/workflows/openjdk-11-runtime-rhel9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: UBI9 OpenJDK 11 Runtime S2I Image CI
on: [push, pull_request]
env:
LANG: en_US.UTF-8
IMAGE: ubi9-openjdk-11-runtime
IMAGE: openjdk-11-runtime-rhel9
jobs:
call-openjdkci:
uses: ./.github/workflows/image-workflow-template.yml
with:
image: ubi9-openjdk-11-runtime
image: openjdk-11-runtime-rhel9
14 changes: 0 additions & 14 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ These are the OpenJDK Source to Image (S2I) images for Red Hat OpenShift.

### From https://access.redhat.com/containers/[Red Hat Container Catalog]

* link:https://catalog.redhat.com/software/containers/ubi9/openjdk-11/61ee7bafed74b2ffb22b07ab[ubi9/openjdk-11]
* link:https://catalog.redhat.com/software/containers/ubi9/openjdk-17/61ee7c26ed74b2ffb22b07f6[ubi9/openjdk-17]
* link:https://catalog.redhat.com/software/containers/ubi9/openjdk-11-runtime/61ee7d1c33f211c45407a91c[ubi9/openjdk-11-runtime]
* link:https://catalog.redhat.com/software/containers/ubi9/openjdk-17-runtime/61ee7d45384a3eb331996bee[ubi9/openjdk-17-runtime]

The UBI9-based OpenJDK images are available under the terms of the
Expand All @@ -30,24 +28,12 @@ These sources are prepared and tested for Cekit 4.1.1.

## Red Hat Universal Base Image 9 versions

### Red Hat Universal Base Image 9 with OpenJDK 11

cekit --descriptor ubi9-openjdk-11.yaml build podman

This will produce an image named `ubi9/openjdk-11`.

### Red Hat Universal Base Image 9 with OpenJDK 17

cekit --descriptor ubi9-openjdk-17.yaml build podman

This will produce an image named `ubi9/openjdk-17`.

### Red Hat Universal Base Image 9 with OpenJDK 11 - Runtime

cekit --descriptor ubi9-openjdk-11-runtime.yaml build podman

This will produce an image named `ubi9/openjdk-11-runtime`.

### Red Hat Universal Base Image 9 with OpenJDK 17 - Runtime

cekit --descriptor ubi9-openjdk-17-runtime.yaml build podman
Expand Down
Loading