Skip to content

Make CentOS ImageStream json actually based on CentOS containers #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daveol wants to merge 1 commit into from
Closed

Make CentOS ImageStream json actually based on CentOS containers #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions imagestreams/imagestreams.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
https://github.com/sclorg/nginx-container/blob/master/APP_VERSION/README.md.
imagestream_files:
- filename: nginx-centos.json
latest: "1.26-ubi9"
latest: "1.26-el9"
distros:
- name: UBI 8
app_versions: ["1.22", "1.24"]
- name: CentOS Stream 8
app_versions: ["1.24"]

- name: UBI 9
- name: CentOS Stream 9
app_versions: ["1.20", "1.22", "1.24", "1.26"]

- name: UBI 10
- name: CentOS Stream 10
app_versions: ["1.26"]

- filename: nginx-rhel.json
Expand Down
71 changes: 26 additions & 45 deletions imagestreams/nginx-centos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,133 +10,114 @@
"spec": {
"tags": [
{
"name": "1.22-ubi8",
"name": "1.24-el8",
"annotations": {
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 8)",
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (CentOS Stream 8)",
"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.",
"iconClass": "icon-nginx",
"tags": "builder,nginx",
"version": "1.22",
"sampleRepo": "https://github.com/sclorg/nginx-ex.git"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi8/nginx-122:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "1.24-ubi8",
"annotations": {
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 8)",
"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.24/README.md.",
"description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS Stream 8. 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/ubi8/nginx-124:latest"
"name": "quay.io/sclorg/nginx-124-c8s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "1.20-ubi9",
"name": "1.20-el9",
"annotations": {
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 9)",
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (CentOS Stream 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.20/README.md.",
"description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS Stream 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.",
"iconClass": "icon-nginx",
"tags": "builder,nginx",
"version": "1.20",
"sampleRepo": "https://github.com/sclorg/nginx-ex.git"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi9/nginx-120:latest"
"name": "quay.io/sclorg/nginx-120-c9s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "1.22-ubi9",
"name": "1.22-el9",
"annotations": {
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 9)",
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (CentOS Stream 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.22/README.md.",
"description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS Stream 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.",
"iconClass": "icon-nginx",
"tags": "builder,nginx",
"version": "1.22",
"sampleRepo": "https://github.com/sclorg/nginx-ex.git"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi9/nginx-122:latest"
"name": "quay.io/sclorg/nginx-122-c9s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "1.24-ubi9",
"name": "1.24-el9",
"annotations": {
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 9)",
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (CentOS Stream 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.",
"description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS Stream 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"
"name": "quay.io/sclorg/nginx-124-c9s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "1.26-ubi9",
"name": "1.26-el9",
"annotations": {
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.26 (UBI 9)",
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.26 (CentOS Stream 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.26/README.md.",
"description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS Stream 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.26/README.md.",
"iconClass": "icon-nginx",
"tags": "builder,nginx",
"version": "1.26",
"sampleRepo": "https://github.com/sclorg/nginx-ex.git"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi9/nginx-126:latest"
"name": "quay.io/sclorg/nginx-126-c9s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "1.26-ubi10",
"name": "1.26-el10",
"annotations": {
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.26 (UBI 10)",
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.26 (CentOS Stream 10)",
"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 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.26/README.md.",
"description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS Stream 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.26/README.md.",
"iconClass": "icon-nginx",
"tags": "builder,nginx",
"version": "1.26",
"sampleRepo": "https://github.com/sclorg/nginx-ex.git"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi10/nginx-126:latest"
"name": "quay.io/sclorg/nginx-126-c10s:latest"
},
"referencePolicy": {
"type": "Local"
Expand All @@ -147,15 +128,15 @@
"annotations": {
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.26 (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 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.26/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 CentOS Stream 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.26/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.26",
"sampleRepo": "https://github.com/sclorg/nginx-ex.git"
},
"from": {
"kind": "ImageStreamTag",
"name": "1.26-ubi9"
"name": "1.26-el9"
},
"referencePolicy": {
"type": "Local"
Expand Down