Skip to content
Merged
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
95 changes: 91 additions & 4 deletions examples/image-streams/image-streams-centos7.json
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,27 @@
"type": "Local"
}
},
{
"name": "14-ubi8-minimal",
"annotations": {
"description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.",
"iconClass": "icon-nodejs",
"openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git",
"tags": "builder,nodejs",
"version": "14"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi8/nodejs-14-minimal:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "14-ubi7",
"annotations": {
Expand All @@ -814,7 +835,7 @@
"openshift.io/display-name": "Node.js 14 (UBI 7)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git",
"tags": "builder,nodejs",
"tags": "builder,nodejs,hidden",
"version": "14"
},
"from": {
Expand Down Expand Up @@ -856,7 +877,7 @@
"openshift.io/display-name": "Node.js 12 (UBI 7)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git",
"tags": "builder,nodejs",
"tags": "builder,nodejs,hidden",
"version": "12"
},
"from": {
Expand Down Expand Up @@ -997,6 +1018,28 @@
"referencePolicy": {
"type": "Local"
}
},
{
"name": "5.26-ubi8",
"annotations": {
"description": "Build and run Perl 5.26 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.26-mod_fcgid/README.md.",
"iconClass": "icon-perl",
"openshift.io/display-name": "Perl 5.26 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/dancer-ex.git",
"supports": "perl:5.26,perl",
"tags": "builder,perl",
"version": "5.26"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi8/perl-526:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
},
Expand Down Expand Up @@ -1332,7 +1375,7 @@
{
"name": "latest",
"annotations": {
"description": "Build and run Python applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.8/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Python available on OpenShift, including major version updates.",
"description": "Build and run Python applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.9/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Python available on OpenShift, including major version updates.",
"iconClass": "icon-python",
"openshift.io/display-name": "Python (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
Expand All @@ -1342,7 +1385,29 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "3.8-ubi8"
"name": "3.9-ubi8"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "3.9-ubi8",
"annotations": {
"description": "Build and run Python 3.9 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.9/README.md.",
"iconClass": "icon-python",
"openshift.io/display-name": "Python 3.9 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/django-ex.git",
"supports": "python:3.9,python",
"tags": "builder,python",
"version": "3.9"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi8/python-39:latest"
},
"generation": null,
"importPolicy": {},
Expand Down Expand Up @@ -2192,6 +2257,28 @@
"referencePolicy": {
"type": "Local"
}
},
{
"name": "24.0",
"annotations": {
"description": "Build and run WildFly 24 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.",
"iconClass": "icon-wildfly",
"openshift.io/display-name": "WildFly 24",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
"supports": "wildfly:24,jee,java",
"tags": "builder,wildfly,java",
"version": "24.0"
},
"from": {
"kind": "DockerImage",
"name": "quay.io/wildfly/wildfly-centos7:24.0"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
},
Expand Down
3 changes: 0 additions & 3 deletions examples/quickstarts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ instantiating them.
* [Django](https://raw.githubusercontent.com/openshift/library/master/arch/x86_64/official/django/templates/django-psql-example.json) - Provides a basic Django (Python) application with a PostgreSQL database. For more information see the [source repository](https://github.com/sclorg/django-ex).
* [Django persistent](https://raw.githubusercontent.com/openshift/library/master/arch/x86_64/official/django/templates/django-psql-persistent.json) - Provides a basic Django (Python) application with a persistent PostgreSQL database. Note: requires available persistent volumes. For more information see the [source repository](https://github.com/sclorg/django-ex).

* [.NET Core](https://raw.githubusercontent.com/openshift/library/master/arch/x86_64/official/dotnet/templates/dotnet-example.json) - Provides a basic .NET Core application. For more information see the [source repository](https://github.com/redhat-developer/s2i-dotnetcore).
* [[.NET Core persistent](https://raw.githubusercontent.com/openshift/library/master/arch/x86_64/official/dotnet/templates/dotnet-pgsql-persistent.json) - Provides a basic .NET Core application with a persistent PostgreSQL database. Note: requires available persistent volumes. For more information see the [source repository](https://github.com/redhat-developer/s2i-dotnetcore).

* [Httpd](https://raw.githubusercontent.com/openshift/library/master/arch/x86_64/official/httpd/templates/httpd-example.json) - Provides a basic Httpd static content application. For more information see the [source repository](https://github.com/openshift/httpd-ex).

* [Nginx](https://raw.githubusercontent.com/openshift/library/master/arch/x86_64/official/nginx/templates/nginx-example.json) - Provides a basic Nginx static content application. For more information see the [source repository](https://github.com/sclorg/nginx-ex).
Expand Down
1 change: 0 additions & 1 deletion examples/quickstarts/dotnet-pgsql-persistent.json

This file was deleted.

1 change: 0 additions & 1 deletion examples/quickstarts/dotnet.json

This file was deleted.

135 changes: 91 additions & 44 deletions test/extended/testdata/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.