Skip to content

Commit

Permalink
Merge pull request #20012 from bparees/import
Browse files Browse the repository at this point in the history 
update external example content
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Jun 19, 2018
2 parents 4e4cdcf + e6730e9 commit 7998c15
Show file tree
Hide file tree
Showing 12 changed files with 736 additions and 85 deletions.
2 changes: 1 addition & 1 deletion examples/db-templates/mysql-ephemeral-template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
"value": "sampledb"
},
{
"description": "Version of MySQL image to be used (5.5, 5.6, 5.7, or latest).",
"description": "Version of MySQL image to be used (5.7, or latest).",
"displayName": "Version of MySQL Image",
"name": "MYSQL_VERSION",
"required": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/db-templates/mysql-persistent-template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
"value": "1Gi"
},
{
"description": "Version of MySQL image to be used (5.5, 5.6, 5.7, or latest).",
"description": "Version of MySQL image to be used (5.7, or latest).",
"displayName": "Version of MySQL Image",
"name": "MYSQL_VERSION",
"required": true,
Expand Down
134 changes: 124 additions & 10 deletions examples/image-streams/image-streams-centos7.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
},
"from": {
"kind": "DockerImage",
"name": "docker.io/openshift/jenkins-2-centos7:v3.10"
"name": "docker.io/openshift/jenkins-2-centos7:v3.11"
},
"name": "2",
"referencePolicy": {
Expand Down Expand Up @@ -259,7 +259,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "3.4"
"name": "3.6"
},
"name": "latest",
"referencePolicy": {
Expand Down Expand Up @@ -337,6 +337,24 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Provides a MongoDB 3.6 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/tree/master/3.6/README.md.",
"iconClass": "icon-mongodb",
"openshift.io/display-name": "MongoDB 3.6",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,mongodb",
"version": "3.6"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/centos/mongodb-36-centos7:latest"
},
"name": "3.6",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down Expand Up @@ -532,7 +550,7 @@
"tags": [
{
"annotations": {
"description": "Build and run Node.js applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/8/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major versions updates.",
"description": "Build and run Node.js applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/bucharest-gold/centos7-s2i-nodejs.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major versions updates.",
"iconClass": "icon-nodejs",
"openshift.io/display-name": "Node.js (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
Expand All @@ -542,7 +560,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "8"
"name": "10"
},
"name": "latest",
"referencePolicy": {
Expand Down Expand Up @@ -627,6 +645,44 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Build and run Node.js 8 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/bucharest-gold/centos7-s2i-nodejs.",
"iconClass": "icon-nodejs",
"openshift.io/display-name": "Node.js 8 (RHOAR)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/openshift/nodejs-ex.git",
"tags": "builder,nodejs",
"version": "8"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/bucharestgold/centos7-s2i-nodejs:8.x"
},
"name": "8-RHOAR",
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Build and run Node.js 10 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/bucharest-gold/centos7-s2i-nodejs.",
"iconClass": "icon-nodejs",
"openshift.io/display-name": "Node.js 10",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/openshift/nodejs-ex.git",
"tags": "builder,nodejs",
"version": "10"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/bucharestgold/centos7-s2i-nodejs:10.x"
},
"name": "10",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down Expand Up @@ -654,7 +710,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "5.24"
"name": "5.26"
},
"name": "latest",
"referencePolicy": {
Expand Down Expand Up @@ -720,6 +776,26 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Build and run Perl 5.26 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26/README.md.",
"iconClass": "icon-perl",
"openshift.io/display-name": "Perl 5.26",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/openshift/dancer-ex.git",
"supports": "perl:5.26,perl",
"tags": "builder,perl",
"version": "5.26"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/centos/perl-526-centos7:latest"
},
"name": "5.26",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down Expand Up @@ -850,15 +926,15 @@
"tags": [
{
"annotations": {
"description": "Provides a PostgreSQL database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/tree/master/9.6/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PostgreSQL available on OpenShift, including major versions updates.",
"description": "Provides a PostgreSQL database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/generated/10/root/usr/share/container-scripts/postgresql/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PostgreSQL available on OpenShift, including major versions updates.",
"iconClass": "icon-postgresql",
"openshift.io/display-name": "PostgreSQL (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,postgresql"
},
"from": {
"kind": "ImageStreamTag",
"name": "9.6"
"name": "10"
},
"name": "latest",
"referencePolicy": {
Expand Down Expand Up @@ -903,7 +979,7 @@
},
{
"annotations": {
"description": "Provides a PostgreSQL 9.5 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/tree/master/9.5/README.md.",
"description": "Provides a PostgreSQL 9.5 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/generated/9.5/root/usr/share/container-scripts/postgresql/README.md.",
"iconClass": "icon-postgresql",
"openshift.io/display-name": "PostgreSQL 9.5",
"openshift.io/provider-display-name": "Red Hat, Inc.",
Expand All @@ -921,7 +997,7 @@
},
{
"annotations": {
"description": "Provides a PostgreSQL 9.6 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/tree/master/9.6/README.md.",
"description": "Provides a PostgreSQL 9.6 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/generated/9.6/root/usr/share/container-scripts/postgresql/README.md.",
"iconClass": "icon-postgresql",
"openshift.io/display-name": "PostgreSQL 9.6",
"openshift.io/provider-display-name": "Red Hat, Inc.",
Expand All @@ -936,6 +1012,24 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Provides a PostgreSQL 10 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/generated/10/root/usr/share/container-scripts/postgresql/README.md.",
"iconClass": "icon-postgresql",
"openshift.io/display-name": "PostgreSQL 10",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,postgresql",
"version": "10"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/centos/postgresql-10-centos7:latest"
},
"name": "10",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down Expand Up @@ -1275,7 +1369,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "12.0"
"name": "13.0"
},
"name": "latest",
"referencePolicy": {
Expand Down Expand Up @@ -1401,6 +1495,26 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Build and run WildFly 13 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/openshift-s2i/s2i-wildfly/blob/master/README.md.",
"iconClass": "icon-wildfly",
"openshift.io/display-name": "WildFly 13",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
"supports": "wildfly:13,jee,java",
"tags": "builder,wildfly,java",
"version": "13.0"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/openshift/wildfly-130-centos7:latest"
},
"name": "13.0",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
Loading

0 comments on commit 7998c15

Please sign in to comment.