From 7a9f263c77fc256ab9efe00be106023c4b7a1401 Mon Sep 17 00:00:00 2001 From: aroyoredhat <96247654+aroyoredhat@users.noreply.github.com> Date: Mon, 25 May 2026 14:52:31 +0000 Subject: [PATCH] Automated periodic sync of the supported OCP samples from the openshift library. --- .../imagestreams/nodejs-rhel-aarch64.json | 126 ------------------ .../php/imagestreams/php-rhel-aarch64.json | 29 +++- .../templates/rails-pgsql-persistent.json | 6 +- .../nodejs/imagestreams/nodejs-rhel.json | 126 ------------------ .../php/imagestreams/php-rhel.json | 29 +++- .../templates/rails-pgsql-persistent.json | 6 +- .../nodejs/imagestreams/nodejs-rhel.json | 126 ------------------ .../ocp-s390x/php/imagestreams/php-rhel.json | 29 +++- .../templates/rails-pgsql-persistent.json | 6 +- .../nodejs/imagestreams/nodejs-rhel.json | 126 ------------------ .../ocp-x86_64/php/imagestreams/php-rhel.json | 29 +++- .../templates/rails-pgsql-persistent.json | 6 +- 12 files changed, 112 insertions(+), 532 deletions(-) diff --git a/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json b/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json index 88271e899..018168ae5 100755 --- a/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json @@ -13,48 +13,6 @@ "local": false }, "tags": [ - { - "name": "20-ubi8", - "annotations": { - "description": "Build and run Node.js 20 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20-minimal-ubi8", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi8", "annotations": { @@ -97,48 +55,6 @@ "type": "Local" } }, - { - "name": "20-ubi9", - "annotations": { - "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20 (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20-minimal-ubi9", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi9", "annotations": { @@ -223,27 +139,6 @@ "type": "Local" } }, - { - "name": "20-ubi8-minimal", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi8-minimal", "annotations": { @@ -265,27 +160,6 @@ "type": "Local" } }, - { - "name": "20-ubi9-minimal", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi9-minimal", "annotations": { diff --git a/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json b/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json index 64e3fe5df..55c43e48d 100755 --- a/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json @@ -139,20 +139,41 @@ "type": "Local" } }, + { + "name": "8.4-ubi10", + "annotations": { + "description": "Build and run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/README.md.", + "iconClass": "icon-php", + "openshift.io/display-name": "PHP 8.4 (UBI 10)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", + "tags": "builder,php", + "version": "8.4" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi10/php-84:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { - "description": "Build and run PHP 8.3 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/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 run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/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-php", - "openshift.io/display-name": "PHP 8.3 (Latest)", + "openshift.io/display-name": "PHP 8.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", "tags": "builder,php", - "version": "8.3" + "version": "8.4" }, "from": { "kind": "ImageStreamTag", - "name": "8.3-ubi10" + "name": "8.4-ubi10" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json index ca4b5777b..23eec24dc 100755 --- a/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json @@ -244,7 +244,7 @@ "value": "${RAILS_ENV}" } ], - "image": " ", + "image": "${NAME}:latest", "livenessProbe": { "httpGet": { "path": "/articles", @@ -350,7 +350,7 @@ "value": "${RAILS_ENV}" } ], - "image": " ", + "image": "${NAME}:latest", "name": "ruby-init-container" } ] @@ -460,7 +460,7 @@ "value": "${POSTGRESQL_SHARED_BUFFERS}" } ], - "image": " ", + "image": "postgresql:${POSTGRESQL_VERSION}", "livenessProbe": { "exec": { "command": [ diff --git a/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json index 88271e899..018168ae5 100755 --- a/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json @@ -13,48 +13,6 @@ "local": false }, "tags": [ - { - "name": "20-ubi8", - "annotations": { - "description": "Build and run Node.js 20 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20-minimal-ubi8", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi8", "annotations": { @@ -97,48 +55,6 @@ "type": "Local" } }, - { - "name": "20-ubi9", - "annotations": { - "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20 (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20-minimal-ubi9", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi9", "annotations": { @@ -223,27 +139,6 @@ "type": "Local" } }, - { - "name": "20-ubi8-minimal", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi8-minimal", "annotations": { @@ -265,27 +160,6 @@ "type": "Local" } }, - { - "name": "20-ubi9-minimal", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi9-minimal", "annotations": { diff --git a/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json b/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json index 64e3fe5df..55c43e48d 100755 --- a/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json @@ -139,20 +139,41 @@ "type": "Local" } }, + { + "name": "8.4-ubi10", + "annotations": { + "description": "Build and run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/README.md.", + "iconClass": "icon-php", + "openshift.io/display-name": "PHP 8.4 (UBI 10)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", + "tags": "builder,php", + "version": "8.4" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi10/php-84:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { - "description": "Build and run PHP 8.3 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/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 run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/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-php", - "openshift.io/display-name": "PHP 8.3 (Latest)", + "openshift.io/display-name": "PHP 8.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", "tags": "builder,php", - "version": "8.3" + "version": "8.4" }, "from": { "kind": "ImageStreamTag", - "name": "8.3-ubi10" + "name": "8.4-ubi10" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json index ca4b5777b..23eec24dc 100755 --- a/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json @@ -244,7 +244,7 @@ "value": "${RAILS_ENV}" } ], - "image": " ", + "image": "${NAME}:latest", "livenessProbe": { "httpGet": { "path": "/articles", @@ -350,7 +350,7 @@ "value": "${RAILS_ENV}" } ], - "image": " ", + "image": "${NAME}:latest", "name": "ruby-init-container" } ] @@ -460,7 +460,7 @@ "value": "${POSTGRESQL_SHARED_BUFFERS}" } ], - "image": " ", + "image": "postgresql:${POSTGRESQL_VERSION}", "livenessProbe": { "exec": { "command": [ diff --git a/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json index 88271e899..018168ae5 100755 --- a/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json @@ -13,48 +13,6 @@ "local": false }, "tags": [ - { - "name": "20-ubi8", - "annotations": { - "description": "Build and run Node.js 20 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20-minimal-ubi8", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi8", "annotations": { @@ -97,48 +55,6 @@ "type": "Local" } }, - { - "name": "20-ubi9", - "annotations": { - "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20 (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20-minimal-ubi9", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi9", "annotations": { @@ -223,27 +139,6 @@ "type": "Local" } }, - { - "name": "20-ubi8-minimal", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi8-minimal", "annotations": { @@ -265,27 +160,6 @@ "type": "Local" } }, - { - "name": "20-ubi9-minimal", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi9-minimal", "annotations": { diff --git a/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json b/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json index 64e3fe5df..55c43e48d 100755 --- a/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json @@ -139,20 +139,41 @@ "type": "Local" } }, + { + "name": "8.4-ubi10", + "annotations": { + "description": "Build and run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/README.md.", + "iconClass": "icon-php", + "openshift.io/display-name": "PHP 8.4 (UBI 10)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", + "tags": "builder,php", + "version": "8.4" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi10/php-84:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { - "description": "Build and run PHP 8.3 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/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 run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/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-php", - "openshift.io/display-name": "PHP 8.3 (Latest)", + "openshift.io/display-name": "PHP 8.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", "tags": "builder,php", - "version": "8.3" + "version": "8.4" }, "from": { "kind": "ImageStreamTag", - "name": "8.3-ubi10" + "name": "8.4-ubi10" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json index ca4b5777b..23eec24dc 100755 --- a/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json @@ -244,7 +244,7 @@ "value": "${RAILS_ENV}" } ], - "image": " ", + "image": "${NAME}:latest", "livenessProbe": { "httpGet": { "path": "/articles", @@ -350,7 +350,7 @@ "value": "${RAILS_ENV}" } ], - "image": " ", + "image": "${NAME}:latest", "name": "ruby-init-container" } ] @@ -460,7 +460,7 @@ "value": "${POSTGRESQL_SHARED_BUFFERS}" } ], - "image": " ", + "image": "postgresql:${POSTGRESQL_VERSION}", "livenessProbe": { "exec": { "command": [ diff --git a/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json index 88271e899..018168ae5 100755 --- a/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json @@ -13,48 +13,6 @@ "local": false }, "tags": [ - { - "name": "20-ubi8", - "annotations": { - "description": "Build and run Node.js 20 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20-minimal-ubi8", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi8", "annotations": { @@ -97,48 +55,6 @@ "type": "Local" } }, - { - "name": "20-ubi9", - "annotations": { - "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20 (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20-minimal-ubi9", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi9", "annotations": { @@ -223,27 +139,6 @@ "type": "Local" } }, - { - "name": "20-ubi8-minimal", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi8-minimal", "annotations": { @@ -265,27 +160,6 @@ "type": "Local" } }, - { - "name": "20-ubi9-minimal", - "annotations": { - "description": "Build and run Node.js 20-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 20-minimal (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs", - "version": "20-minimal" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "22-ubi9-minimal", "annotations": { diff --git a/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json b/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json index 64e3fe5df..55c43e48d 100755 --- a/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json @@ -139,20 +139,41 @@ "type": "Local" } }, + { + "name": "8.4-ubi10", + "annotations": { + "description": "Build and run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/README.md.", + "iconClass": "icon-php", + "openshift.io/display-name": "PHP 8.4 (UBI 10)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", + "tags": "builder,php", + "version": "8.4" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi10/php-84:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { - "description": "Build and run PHP 8.3 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/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 run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/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-php", - "openshift.io/display-name": "PHP 8.3 (Latest)", + "openshift.io/display-name": "PHP 8.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", "tags": "builder,php", - "version": "8.3" + "version": "8.4" }, "from": { "kind": "ImageStreamTag", - "name": "8.3-ubi10" + "name": "8.4-ubi10" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json index ca4b5777b..23eec24dc 100755 --- a/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json @@ -244,7 +244,7 @@ "value": "${RAILS_ENV}" } ], - "image": " ", + "image": "${NAME}:latest", "livenessProbe": { "httpGet": { "path": "/articles", @@ -350,7 +350,7 @@ "value": "${RAILS_ENV}" } ], - "image": " ", + "image": "${NAME}:latest", "name": "ruby-init-container" } ] @@ -460,7 +460,7 @@ "value": "${POSTGRESQL_SHARED_BUFFERS}" } ], - "image": " ", + "image": "postgresql:${POSTGRESQL_VERSION}", "livenessProbe": { "exec": { "command": [