Merge pull request #297 from jmtd/ubi9-fork

UBI9 images (alternative approach)

Author: jmtd

.github/workflows/ubi8-openjdk-11-runtime.yml

@@ -1,9 +1,10 @@
-name: OpenJDK 8 S2I Image CI
+name: UBI9 OpenJDK 11 Runtime S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.6.0
+  CEKIT_VERSION: 4.1.1
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
+  IMAGE: ubi9-openjdk-11-runtime
 jobs:
   openjdkci:
     name: OpenJDK S2I Build and Test
@@ -13,9 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
+        run:  docker pull registry.access.redhat.com/ubi9/ubi-minimal:latest
       - name: Setup required system packages
         run: |
           sudo apt-get update
@@ -29,8 +28,7 @@ jobs:
       - name: Build
         run: |
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-8.yaml build docker
-          docker image ls
+          cekit -v --descriptor ${{ env.IMAGE }}.yaml build docker
       - name: install s2i binary
         run: |
           echo ===== Installing s2i from ${{ env.S2I_URL }} =====
@@ -43,4 +41,4 @@ jobs:
       - name: Behave Tests
         run: |
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-8.yaml test behave
+          cekit -v --descriptor ${{ env.IMAGE }}.yaml test behave

.github/workflows/ubi8-openjdk-17-runtime.yml

@@ -1,9 +1,10 @@
-name: OpenJDK 11 S2I Image CI
+name: UBI9 OpenJDK 11 S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.6.0
+  CEKIT_VERSION: 4.1.1
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
+  IMAGE: ubi9-openjdk-11
 jobs:
   openjdkci:
     name: OpenJDK S2I Build and Test
@@ -13,9 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
+        run:  docker pull registry.access.redhat.com/ubi9/ubi-minimal:latest
       - name: Setup required system packages
         run: |
           sudo apt-get update
@@ -29,8 +28,7 @@ jobs:
       - name: Build
         run: |
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-11.yaml build docker
-          docker image ls
+          cekit -v --descriptor ${{ env.IMAGE }}.yaml build docker
       - name: install s2i binary
         run: |
           echo ===== Installing s2i from ${{ env.S2I_URL }} =====
@@ -43,4 +41,4 @@ jobs:
       - name: Behave Tests
         run: |
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-11.yaml test behave
+          cekit -v --descriptor ${{ env.IMAGE }}.yaml test behave

.github/workflows/ubi8-openjdk-8.yml renamed to .github/workflows/ubi9-openjdk-11-runtime.yml

@@ -1,9 +1,10 @@
-name: OpenJDK 17 S2I Image CI
+name: UBI9 OpenJDK 17 Runtime S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.6.0
+  CEKIT_VERSION: 4.1.1
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
+  IMAGE: ubi9-openjdk-17-runtime
 jobs:
   openjdkci:
     name: OpenJDK S2I Build and Test
@@ -13,9 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
+        run:  docker pull registry.access.redhat.com/ubi9/ubi-minimal:latest
       - name: Setup required system packages
         run: |
           sudo apt-get update
@@ -29,8 +28,7 @@ jobs:
       - name: Build
         run: |
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-17.yaml build docker
-          docker image ls
+          cekit -v --descriptor ${{ env.IMAGE }}.yaml build docker
       - name: install s2i binary
         run: |
           echo ===== Installing s2i from ${{ env.S2I_URL }} =====
@@ -43,4 +41,4 @@ jobs:
       - name: Behave Tests
         run: |
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-17.yaml test behave
+          cekit -v --descriptor ${{ env.IMAGE }}.yaml test behave

.github/workflows/ubi8-openjdk-11.yml renamed to .github/workflows/ubi9-openjdk-11.yml

@@ -1,21 +1,20 @@
-name: OpenJDK 8 Runtime Image CI
+name: UBI9 OpenJDK 17 S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.11.0
+  CEKIT_VERSION: 4.1.1
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
+  IMAGE: ubi9-openjdk-17
 jobs:
   openjdkci:
-    name: OpenJDK Runtime Build and Test
+    name: OpenJDK S2I Build and Test
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
       - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
+        run:  docker pull registry.access.redhat.com/ubi9/ubi-minimal:latest
       - name: Setup required system packages
         run: |
           sudo apt-get update
@@ -29,11 +28,7 @@ jobs:
       - name: Build
         run: |
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-8-runtime.yaml build docker
-          docker image ls
-
-# even though we don't run any S2I tests for the runtime images, the test suite
-# will fail to start if the s2i binary is not present.
+          cekit -v --descriptor ${{ env.IMAGE }}.yaml build docker
       - name: install s2i binary
         run: |
           echo ===== Installing s2i from ${{ env.S2I_URL }} =====
@@ -43,8 +38,7 @@ jobs:
           sudo mv s2i /usr/bin
           which s2i
           s2i version
-
       - name: Behave Tests
         run: |
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-8-runtime.yaml test behave
+          cekit -v --descriptor ${{ env.IMAGE }}.yaml test behave

.github/workflows/ubi8-openjdk-17.yml renamed to .github/workflows/ubi9-openjdk-17-runtime.yml

@@ -6,55 +6,44 @@ These are the OpenJDK Source to Image (S2I) images for Red Hat OpenShift.
 
 ### From https://access.redhat.com/containers/[Red Hat Container Catalog]
 
-The UBI8-based OpenJDK images are available under the terms of the
-link:https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI[UBI EULA]:
+The UBI9-based OpenJDK images are available under the terms of the
+link:https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI[UBI EULA].
 
- * link:https://catalog.redhat.com/software/containers/ubi8/openjdk-8/5dd6a48dbed8bd164a09589a[ubi8/openjdk-8]
- * link:https://catalog.redhat.com/software/containers/ubi8/openjdk-11/5dd6a4b45a13461646f677f4[ubi8/openjdk-11]
+ * (GA catalog URIs go here)
 
-The RHEL7-based OpenJDK images require a Red Hat subscription:
-
- * link:https://catalog.redhat.com/software/containers/redhat-openjdk-18/openjdk18-openshift/58ada5701fbe981673cd6b10[redhat-openjdk-18/openjdk18-openshift]
-  * link:https://catalog.redhat.com/software/containers/openjdk/openjdk-11-rhel7/5bf57185dd19c775cddc4ce5[openjdk/openjdk-11-rhel7]
+Older RHEL8 and RHEL7-based image sources are in the `develop` branch.
 
 ## How to build the images
 
 You need to https://cekit.readthedocs.io/en/develop/installation.html[install Cekit] to build these images.
 
-These sources are prepared and tested for Cekit 3.6.0.
-
-For building within Red Hat, the instructions vary slightly, see link:redhat/README.adoc[].
-
-## Red Hat Universal Base Image 8 versions
-
-### Red Hat Universal Base Image 8 with OpenJDK 8
+These sources are prepared and tested for Cekit 4.1.1.
 
-    cekit --descriptor ubi8-openjdk-8.yaml build podman
+## Red Hat Universal Base Image 9 versions
 
-This will produce an image named `ubi8/openjdk-8`.
+### Red Hat Universal Base Image 9 with OpenJDK 11
 
-### Red Hat Universal Base Image 8 with OpenJDK 11
+    cekit --descriptor ubi9-openjdk-11.yaml build podman
 
-    cekit --descriptor ubi8-openjdk-11.yaml build podman
+This will produce an image named `ubi9/openjdk-11`.
 
-This will produce an image named `ubi8/openjdk-11`.
+### Red Hat Universal Base Image 9 with OpenJDK 17
 
-## Red Hat Enterprise Linux 7 Image versions
+    cekit --descriptor ubi9-openjdk-17.yaml build podman
 
-You will need an active Red Hat subscription on the host you use to
-build these images.
+This will produce an image named `ubi9/openjdk-17`.
 
-### RHEL 7 OpenJDK 8
+### Red Hat Universal Base Image 9 with OpenJDK 11 - Runtime
 
-    cekit --descriptor openjdk18-openshift.yaml build podman
+    cekit --descriptor ubi9-openjdk-11-runtime.yaml build podman
 
-This will produce an image named `redhat-openjdk-8/openjdk18-openshift`.
+This will produce an image named `ubi9/openjdk-11-runtime`.
 
-### RHEL 7 OpenJDK 11
+### Red Hat Universal Base Image 9 with OpenJDK 17 - Runtime
 
-    cekit --descriptor openjdk-11-rhel7.yaml build podman
+    cekit --descriptor ubi9-openjdk-17-runtime.yaml build podman
 
-This will produce an image named `openjdk/openjdk-11-rhel7`.
+This will produce an image named `ubi9/openjdk-17-runtime`.
 
 ## Contributing
 
@@ -63,5 +52,5 @@ Origin (DCO) is required.  See link:CONTRIBUTING.md[].
 
 ## License
 
-© 2020 Red Hat, Inc. Distributed under the terms of the Apache License,
+© 2022 Red Hat, Inc. Distributed under the terms of the Apache License,
 Version 2.0. See link:LICENSE[LICENSE] file.