diff --git a/examples/image-streams/image-streams-centos7.json b/examples/image-streams/image-streams-centos7.json index 4e80d11c0dc7..d545f7d9bc75 100644 --- a/examples/image-streams/image-streams-centos7.json +++ b/examples/image-streams/image-streams-centos7.json @@ -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": { @@ -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": { @@ -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": { @@ -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" + } } ] }, @@ -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.", @@ -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": {}, @@ -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" + } } ] }, diff --git a/examples/quickstarts/README.md b/examples/quickstarts/README.md index 7e5d1a32a57b..c7476a43f155 100644 --- a/examples/quickstarts/README.md +++ b/examples/quickstarts/README.md @@ -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). diff --git a/examples/quickstarts/dotnet-pgsql-persistent.json b/examples/quickstarts/dotnet-pgsql-persistent.json deleted file mode 100644 index 1becba2bb0a8..000000000000 --- a/examples/quickstarts/dotnet-pgsql-persistent.json +++ /dev/null @@ -1 +0,0 @@ -404: Not Found \ No newline at end of file diff --git a/examples/quickstarts/dotnet.json b/examples/quickstarts/dotnet.json deleted file mode 100644 index 1becba2bb0a8..000000000000 --- a/examples/quickstarts/dotnet.json +++ /dev/null @@ -1 +0,0 @@ -404: Not Found \ No newline at end of file diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 51366fa774c2..03f849181ae1 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -20,8 +20,6 @@ // examples/quickstarts/dancer-mysql.json // examples/quickstarts/django-postgresql-persistent.json // examples/quickstarts/django-postgresql.json -// examples/quickstarts/dotnet-pgsql-persistent.json -// examples/quickstarts/dotnet.json // examples/quickstarts/httpd.json // examples/quickstarts/nginx.json // examples/quickstarts/nodejs-postgresql-persistent.json @@ -3610,6 +3608,27 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ "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": { @@ -3618,7 +3637,7 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ "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": { @@ -3660,7 +3679,7 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ "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": { @@ -3801,6 +3820,28 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ "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" + } } ] }, @@ -4136,7 +4177,7 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ { "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.", @@ -4146,7 +4187,29 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ }, "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": {}, @@ -4996,6 +5059,28 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ "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" + } } ] }, @@ -10097,40 +10182,6 @@ func examplesQuickstartsDjangoPostgresqlJson() (*asset, error) { return a, nil } -var _examplesQuickstartsDotnetPgsqlPersistentJson = []byte(`404: Not Found`) - -func examplesQuickstartsDotnetPgsqlPersistentJsonBytes() ([]byte, error) { - return _examplesQuickstartsDotnetPgsqlPersistentJson, nil -} - -func examplesQuickstartsDotnetPgsqlPersistentJson() (*asset, error) { - bytes, err := examplesQuickstartsDotnetPgsqlPersistentJsonBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "examples/quickstarts/dotnet-pgsql-persistent.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _examplesQuickstartsDotnetJson = []byte(`404: Not Found`) - -func examplesQuickstartsDotnetJsonBytes() ([]byte, error) { - return _examplesQuickstartsDotnetJson, nil -} - -func examplesQuickstartsDotnetJson() (*asset, error) { - bytes, err := examplesQuickstartsDotnetJsonBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "examples/quickstarts/dotnet.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - var _examplesQuickstartsHttpdJson = []byte(`{ "kind": "Template", "apiVersion": "v1", @@ -53175,8 +53226,6 @@ var _bindata = map[string]func() (*asset, error){ "examples/quickstarts/dancer-mysql.json": examplesQuickstartsDancerMysqlJson, "examples/quickstarts/django-postgresql-persistent.json": examplesQuickstartsDjangoPostgresqlPersistentJson, "examples/quickstarts/django-postgresql.json": examplesQuickstartsDjangoPostgresqlJson, - "examples/quickstarts/dotnet-pgsql-persistent.json": examplesQuickstartsDotnetPgsqlPersistentJson, - "examples/quickstarts/dotnet.json": examplesQuickstartsDotnetJson, "examples/quickstarts/httpd.json": examplesQuickstartsHttpdJson, "examples/quickstarts/nginx.json": examplesQuickstartsNginxJson, "examples/quickstarts/nodejs-postgresql-persistent.json": examplesQuickstartsNodejsPostgresqlPersistentJson, @@ -53729,8 +53778,6 @@ var _bintree = &bintree{nil, map[string]*bintree{ "dancer-mysql.json": {examplesQuickstartsDancerMysqlJson, map[string]*bintree{}}, "django-postgresql-persistent.json": {examplesQuickstartsDjangoPostgresqlPersistentJson, map[string]*bintree{}}, "django-postgresql.json": {examplesQuickstartsDjangoPostgresqlJson, map[string]*bintree{}}, - "dotnet-pgsql-persistent.json": {examplesQuickstartsDotnetPgsqlPersistentJson, map[string]*bintree{}}, - "dotnet.json": {examplesQuickstartsDotnetJson, map[string]*bintree{}}, "httpd.json": {examplesQuickstartsHttpdJson, map[string]*bintree{}}, "nginx.json": {examplesQuickstartsNginxJson, map[string]*bintree{}}, "nodejs-postgresql-persistent.json": {examplesQuickstartsNodejsPostgresqlPersistentJson, map[string]*bintree{}},