Revamp README and redhat/README

 * remove rhel7
 * add JDK17, runtime images
 * bump copyright year

etc

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

README.adoc

@@ -1,6 +1,7 @@
 # Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK
 
-These are the OpenJDK Source to Image (S2I) images for Red Hat OpenShift.
+These are the OpenJDK Source to Image (S2I) images for the Red Hat
+Universal Base Image (UBI), designed for use with Red Hat OpenShift.
 
 ## Acquiring the Images
 
@@ -11,21 +12,17 @@ link:https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI[UBI
 
  * 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]
-
-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]
+ * link:https://catalog.redhat.com/software/containers/ubi8/openjdk-17/618bdbf34ae3739687568813[ubi8/openjdk-17]
 
 ## 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.
+These sources are prepared and tested for Cekit 4.1.1.
 
 For building within Red Hat, the instructions vary slightly, see link:redhat/README.adoc[].
 
-## Red Hat Universal Base Image 8 versions
+## Builder images
 
 ### Red Hat Universal Base Image 8 with OpenJDK 8
 
@@ -39,22 +36,31 @@ This will produce an image named `ubi8/openjdk-8`.
 
 This will produce an image named `ubi8/openjdk-11`.
 
-## Red Hat Enterprise Linux 7 Image versions
+### Red Hat Universal Base Image 8 with OpenJDK 17
+
+    cekit --descriptor ubi8-openjdk-11.yaml build podman
+
+This will produce an image named `ubi8/openjdk-17`.
+
+## Runtime images
+
+### Red Hat Universal Base Image 8 with OpenJDK 8 runtime
+
+    cekit --descriptor ubi8-openjdk-8-runtime.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 `ubi8/openjdk-8-runtime`.
 
-### RHEL 7 OpenJDK 8
+### Red Hat Universal Base Image 8 with OpenJDK 11 runtime
 
-    cekit --descriptor openjdk18-openshift.yaml build podman
+    cekit --descriptor ubi8-openjdk-11-runtime.yaml build podman
 
-This will produce an image named `redhat-openjdk-8/openjdk18-openshift`.
+This will produce an image named `ubi8/openjdk-11-runtime`.
 
-### RHEL 7 OpenJDK 11
+### Red Hat Universal Base Image 8 with OpenJDK 17 runtime
 
-    cekit --descriptor openjdk-11-rhel7.yaml build podman
+    cekit --descriptor ubi8-openjdk-11-runtime.yaml build podman
 
-This will produce an image named `openjdk/openjdk-11-rhel7`.
+This will produce an image named `ubi8/openjdk-17-runtime`.
 
 ## Contributing
 
@@ -63,5 +69,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.

redhat/README.adoc

@@ -3,7 +3,7 @@
 For building the images internal to Red Hat, we vary the instructions
 slightly.
 
-## Image versions
+## Builder images
 
 ### UBI 8 JDK 8
 
@@ -17,16 +17,29 @@ This will produce an image named `ubi8/openjdk-8`.
 
 This will produce an image named `ubi8/openjdk-11`.
 
-### RHEL 7 OpenJDK 8
+### UBI 8 OpenJDK 17
 
-    cekit --redhat --descriptor openjdk18-openshift.yaml --overrides-file redhat/openjdk18-openshift.yaml build podman
+    cekit --redhat --descriptor ubi8-openjdk-17.yaml build --overrides-file redhat/ubi8-openjdk-17.yaml podman
 
-This will produce an image named `redhat-openjdk-8/openjdk18-openshift`
+This will produce an image named `ubi8/openjdk-17`.
 
-### RHEL 7 OpenJDK 11
+## Runtime images
 
-    cekit --redhat --descriptor openjdk-11-rhel7.yaml build --overrides-file redhat/openjdk-11-rhel7.yaml build podman
+### UBI 8 JDK 8 runtime
 
-This will produce an image named `openjdk/openjdk-11-rhel7`
+    cekit --redhat --descriptor ubi8-openjdk-8-runtime.yaml build --overrides-file redhat/ubi8-openjdk-8-runtime.yaml podman
 
+This will produce an image named `ubi8/openjdk-8-runtime`.
+
+### UBI 8 OpenJDK 11 runtime
+
+    cekit --redhat --descriptor ubi8-openjdk-11-runtime.yaml build --overrides-file redhat/ubi8-openjdk-11-runtime.yaml podman
+
+This will produce an image named `ubi8/openjdk-11-runtime`.
+
+### UBI 8 OpenJDK 17 runtime
+
+    cekit --redhat --descriptor ubi8-openjdk-17-runtime.yaml build --overrides-file redhat/ubi8-openjdk-17-runtime.yaml podman
+
+This will produce an image named `ubi8/openjdk-17-runtime`.