Bump s2i-core image to ubi9

Also update all ubi8->ubi9 references.

Signed-off-by: Harald Judt <[email protected]>

Author: hjudt

1.0/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/s2i-core
+FROM registry.access.redhat.com/ubi9/s2i-core
 
 # This image provides a Common Lisp environment based on QuickLisp and
 # that you can use to run your Common Lisp applications.
@@ -37,7 +37,7 @@ RUN rm /etc/rhsm-host && \
 WORKDIR $HOME
 COPY ./root/ /
 
-# Build libev from source since it is not available in ubi8-base nor ubi8-app-stream repos
+# Build libev from source since it is not available in ubi9-base nor ubi9-app-stream repos
 RUN curl -O "http://dist.schmorp.de/libev/Attic/libev-${LIBEV_VERSION}.tar.gz" && \
     tar xvf libev-${LIBEV_VERSION}.tar.gz && \
     cd libev-${LIBEV_VERSION} && \
@@ -49,7 +49,7 @@ RUN curl -O "http://dist.schmorp.de/libev/Attic/libev-${LIBEV_VERSION}.tar.gz" &
     cd "$HOME" && \
     rm -rf libev*
 
-# Build libssh2 from source since it is not available in ubi8-base nor ubi8-app-stream repos
+# Build libssh2 from source since it is not available in ubi9-base nor ubi9-app-stream repos
 RUN curl -O "https://libssh2.org/download/libssh2-${LIBSSH2_VERSION}.tar.bz2" && \
     tar xvf libssh2-${LIBSSH2_VERSION}.tar.bz2 && \
     cd libssh2-${LIBSSH2_VERSION} && \

1.0/s2i-lisp.json

@@ -9,7 +9,7 @@
         "kind": "BuildConfig",
         "apiVersion": "v1",
         "metadata":{
-          "name": "lisp-ubi8-build"
+          "name": "lisp-ubi9-build"
         },
         "spec": {
           "triggers": [
@@ -37,18 +37,18 @@
               "env": [
                 {
                   "name": "IMAGE_NAME",
-                  "value": "openshift/lisp-ubi8"
+                  "value": "openshift/lisp-ubi9"
                 }],
               "from": {
                  "kind": "ImageStreamTag",
-                 "name": "swarm-ubi8:latest"
+                 "name": "swarm-ubi9:latest"
               }
             }
           },
           "output": {
             "to": {
               "kind": "ImageStreamTag",
-              "name": "lisp-ubi8:latest"
+              "name": "lisp-ubi9:latest"
             }
           }
         }
@@ -57,7 +57,7 @@
       "kind": "ImageStream",
       "apiVersion": "v1",
       "metadata": {
-        "name": "lisp-ubi8"
+        "name": "lisp-ubi9"
       },
       "spec": {
           "dockerImageRepository": "",

1.0/s2i/bin/usage

@@ -8,7 +8,7 @@ To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build https://github.com/container-lisp/sample-lisp-app.git containerlisp/lisp-10-ubi8
+s2i build https://github.com/container-lisp/sample-lisp-app.git containerlisp/lisp-10-ubi9
 
 You can then run the resulting image via:
 docker run -p 8080:8080 sample-lisp-app

README.md

@@ -17,7 +17,7 @@ application using standalone
 [S2I](https://github.com/openshift/source-to-image) and then run the
 resulting image with [docker](http://docker.io) execute:
 ```
-$ s2i build https://github.com/container-lisp/sample-lisp-app quay.io/containerlisp/lisp-10-ubi8 sample-lisp-app
+$ s2i build https://github.com/container-lisp/sample-lisp-app quay.io/containerlisp/lisp-10-ubi9 sample-lisp-app
 $ docker run -p 8080:8080 sample-lisp-app
 ```
 
@@ -30,7 +30,7 @@ $ curl 127.0.0.1:8080
 
 You will likely, however, prefer [OpenShift](https://www.openshift.com), where applications are created like so:
 ```
-$ oc new-app quay.io/containerlisp/lisp-10-ubi8~git://github.com/container-lisp/sample-lisp-app
+$ oc new-app quay.io/containerlisp/lisp-10-ubi9~git://github.com/container-lisp/sample-lisp-app
 ```
 
 A [slynk](https://github.com/joaotavora/sly) server will be started on
@@ -140,8 +140,8 @@ repository.
 Public Container Images
 -----------------------
 
-The ubi8-based S2I images are published on quay.io, as
-`quay.io/containerlisp/lisp-10-ubi8`.  Image tags are as follows:
+The ubi9-based S2I images are published on quay.io, as
+`quay.io/containerlisp/lisp-10-ubi9`.  Image tags are as follows:
 
 * `latest`: the most recent build of the very latest quicklisp, SBCL
   and OS bits.

hack/build.sh

@@ -4,7 +4,7 @@
 # Name of resulting image will be: 'NAMESPACE/BASE_IMAGE_NAME-VERSION-OS'.
 #
 # BASE_IMAGE_NAME - Usually name of the main component within container.
-# OS - Specifies distribution - "ubi8"
+# OS - Specifies distribution - "ubi9"
 # VERSION - Specifies the image version - (must match with subdirectory in repo)
 # TEST_MODE - If set, build a candidate image and test it
 # TAG_ON_SUCCESS - If set, tested image will be re-tagged as a non-candidate

hack/common.mk

@@ -2,7 +2,7 @@ SKIP_SQUASH?=1
 
 build = hack/build.sh
 
-OS = ubi8
+OS = ubi9
 
 script_env = \
 	SKIP_SQUASH=$(SKIP_SQUASH)                      \

hack/update-base.sh

@@ -12,8 +12,8 @@ die() {
 which grype &>/dev/null || die "This script requires grype."
 
 echo "Scanning latest image for fixed vulnerabilities..."
-podman rmi quay.io/containerlisp/lisp-10-ubi8:latest > /dev/null
-VULNS=$(grype -q -o table --only-fixed quay.io/containerlisp/lisp-10-ubi8:latest | grep -i rpm | grep -v suppressed | awk '{printf("%25s\t%s\n", $1, $5)}')
+podman rmi quay.io/containerlisp/lisp-10-ubi9:latest > /dev/null
+VULNS=$(grype -q -o table --only-fixed quay.io/containerlisp/lisp-10-ubi9:latest | grep -i rpm | grep -v suppressed | awk '{printf("%25s\t%s\n", $1, $5)}')
 
 if ! test -z "$VULNS"; then
     LISP_BASE_BUILD_DATE=$(date)

tekton/s2i-lisp-task.yaml

@@ -22,7 +22,7 @@ spec:
     - name: generate
       image: quay.io/openshift-pipeline/s2i
       workingdir: /workspace/source
-      command: ['s2i', 'build', '$(inputs.params.PATH_CONTEXT)', 'quay.io/containerlisp/lisp-10-ubi8', '--as-dockerfile', '/gen-source/Dockerfile.gen']
+      command: ['s2i', 'build', '$(inputs.params.PATH_CONTEXT)', 'quay.io/containerlisp/lisp-10-ubi9', '--as-dockerfile', '/gen-source/Dockerfile.gen']
       volumeMounts:
         - name: gen-source
           mountPath: /gen-source