From f8afa65bdbaacf5e7b23ad6672d6d9a58287611f Mon Sep 17 00:00:00 2001 From: Petr Hracek <phracek@redhat.com> Date: Tue, 14 May 2024 08:19:02 +0200 Subject: [PATCH] Add imagestreams Nginx-124 for RHEL9 (#296) Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com> --- imagestreams/imagestreams.yaml | 12 ++++++------ imagestreams/nginx-centos.json | 27 +++++++++++++++++++++++---- imagestreams/nginx-rhel-aarch64.json | 27 +++++++++++++++++++++++---- imagestreams/nginx-rhel.json | 27 +++++++++++++++++++++++---- 4 files changed, 75 insertions(+), 18 deletions(-) diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index d57789f2..f67944b6 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -13,7 +13,7 @@ https://github.com/sclorg/nginx-container/blob/master/APP_VERSION/README.md. imagestream_files: - filename: nginx-centos.json - latest: "1.22-ubi8" + latest: "1.24-ubi9" distros: - name: UBI 7 app_versions: ["1.20"] @@ -22,10 +22,10 @@ app_versions: ["1.22"] - name: UBI 9 - app_versions: ["1.20", "1.22"] + app_versions: ["1.20", "1.22", "1.24"] - filename: nginx-rhel.json - latest: "1.22-ubi8" + latest: "1.24-ubi9" distros: - name: UBI 7 app_versions: ["1.20"] @@ -34,13 +34,13 @@ app_versions: ["1.22"] - name: UBI 9 - app_versions: ["1.20", "1.22"] + app_versions: ["1.20", "1.22", "1.24"] - filename: nginx-rhel-aarch64.json - latest: "1.22-ubi8" + latest: "1.24-ubi9" distros: - name: UBI 8 app_versions: ["1.22"] - name: UBI 9 - app_versions: ["1.20", "1.22"] + app_versions: ["1.20", "1.22", "1.24"] diff --git a/imagestreams/nginx-centos.json b/imagestreams/nginx-centos.json index 7987f2ba..8772837d 100644 --- a/imagestreams/nginx-centos.json +++ b/imagestreams/nginx-centos.json @@ -85,20 +85,39 @@ "type": "Local" } }, + { + "name": "1.24-ubi9", + "annotations": { + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 9)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", + "iconClass": "icon-nginx", + "tags": "builder,nginx", + "version": "1.24", + "sampleRepo": "https://github.com/sclorg/nginx-ex.git" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi9/nginx-124:latest" + }, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-nginx", "tags": "builder,nginx", - "version": "1.22", + "version": "1.24", "sampleRepo": "https://github.com/sclorg/nginx-ex.git" }, "from": { "kind": "ImageStreamTag", - "name": "1.22-ubi8" + "name": "1.24-ubi9" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/nginx-rhel-aarch64.json b/imagestreams/nginx-rhel-aarch64.json index 09fc30f8..768f9d2c 100644 --- a/imagestreams/nginx-rhel-aarch64.json +++ b/imagestreams/nginx-rhel-aarch64.json @@ -66,20 +66,39 @@ "type": "Local" } }, + { + "name": "1.24-ubi9", + "annotations": { + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 9)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", + "iconClass": "icon-nginx", + "tags": "builder,nginx", + "version": "1.24", + "sampleRepo": "https://github.com/sclorg/nginx-ex.git" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi9/nginx-124:latest" + }, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-nginx", "tags": "builder,nginx", - "version": "1.22", + "version": "1.24", "sampleRepo": "https://github.com/sclorg/nginx-ex.git" }, "from": { "kind": "ImageStreamTag", - "name": "1.22-ubi8" + "name": "1.24-ubi9" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/nginx-rhel.json b/imagestreams/nginx-rhel.json index ffc6b875..16cf30d6 100644 --- a/imagestreams/nginx-rhel.json +++ b/imagestreams/nginx-rhel.json @@ -85,20 +85,39 @@ "type": "Local" } }, + { + "name": "1.24-ubi9", + "annotations": { + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 9)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", + "iconClass": "icon-nginx", + "tags": "builder,nginx", + "version": "1.24", + "sampleRepo": "https://github.com/sclorg/nginx-ex.git" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi9/nginx-124:latest" + }, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-nginx", "tags": "builder,nginx", - "version": "1.22", + "version": "1.24", "sampleRepo": "https://github.com/sclorg/nginx-ex.git" }, "from": { "kind": "ImageStreamTag", - "name": "1.22-ubi8" + "name": "1.24-ubi9" }, "referencePolicy": { "type": "Local"