Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,27 @@
"type": "Local"
}
},
{
"name": "5.32-ubi8",
"annotations": {
"description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.",
"iconClass": "icon-perl",
"openshift.io/display-name": "Perl 5.32 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/dancer-ex.git",
"tags": "builder,perl",
"version": "5.32"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/perl-532:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "5.32-ubi9",
"annotations": {
Expand Down
29 changes: 25 additions & 4 deletions assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
"generation": null,
"importPolicy": {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,48 +55,6 @@
"type": "Local"
}
},
{
"name": "3.11-ubi8",
"annotations": {
"description": "Build and run Python 3.11 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.",
"iconClass": "icon-python",
"openshift.io/display-name": "Python 3.11 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/django-ex.git",
"tags": "builder,python",
"version": "3.11"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/python-311:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "3.12-ubi8",
"annotations": {
"description": "Build and run Python 3.12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.12/README.md.",
"iconClass": "icon-python",
"openshift.io/display-name": "Python 3.12 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/django-ex.git",
"tags": "builder,python",
"version": "3.12"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/python-312:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "3.9-ubi9",
"annotations": {
Expand All @@ -118,27 +76,6 @@
"type": "Local"
}
},
{
"name": "3.11-ubi9",
"annotations": {
"description": "Build and run Python 3.11 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.",
"iconClass": "icon-python",
"openshift.io/display-name": "Python 3.11 (UBI 9)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/django-ex.git",
"tags": "builder,python",
"version": "3.11"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi9/python-311:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "3.12-ubi9",
"annotations": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
"value": "${RAILS_ENV}"
}
],
"image": " ",
"image": "${NAME}:latest",
"livenessProbe": {
"httpGet": {
"path": "/articles",
Expand Down Expand Up @@ -350,7 +350,7 @@
"value": "${RAILS_ENV}"
}
],
"image": " ",
"image": "${NAME}:latest",
"name": "ruby-init-container"
}
]
Expand Down Expand Up @@ -460,7 +460,7 @@
"value": "${POSTGRESQL_SHARED_BUFFERS}"
}
],
"image": " ",
"image": "postgresql:${POSTGRESQL_VERSION}",
"livenessProbe": {
"exec": {
"command": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,27 @@
"type": "Local"
}
},
{
"name": "4.0-ubi9",
"annotations": {
"description": "Build and run Ruby 4.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/4.0/README.md.",
"iconClass": "icon-ruby",
"openshift.io/display-name": "Ruby 4.0 (UBI 9)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/ruby-ex.git",
"tags": "builder,ruby",
"version": "4.0"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi9/ruby-40:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
Comment on lines +100 to +120

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

Repoint latest to Ruby 4.0.

These new tags add Ruby 4.0, but latest still advertises and resolves to 3.3-ubi9 on Lines 164-176. That leaves default consumers on the previous major and contradicts the warning text that latest tracks major-version updates.

Also applies to: 142-162

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@assets/operator/ocp-aarch64/ruby/imagestreams/ruby-rhel-aarch64.json` around
lines 100 - 120, The new Ruby 4.0 imagestream entry should also update the
default `latest` alias so it points to Ruby 4.0 instead of still resolving to
`3.3-ubi9`. Adjust the `latest` image definition in `ruby-rhel-aarch64.json`
alongside the existing 4.0-ubi9 entry so the default tag and its annotations
consistently track the new major version, matching the `latest` behavior used by
consumers.

{
"name": "3.3-ubi10",
"annotations": {
Expand All @@ -118,6 +139,27 @@
"type": "Local"
}
},
{
"name": "4.0-ubi10",
"annotations": {
"description": "Build and run Ruby 4.0 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/4.0/README.md.",
"iconClass": "icon-ruby",
"openshift.io/display-name": "Ruby 4.0 (UBI 10)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/ruby-ex.git",
"tags": "builder,ruby",
"version": "4.0"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi10/ruby-40:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "latest",
"annotations": {
Expand Down
Loading