Skip to content

Commit

Permalink
assets: full sync from library
Browse files Browse the repository at this point in the history
This pulls in the following changes:
* Add UBI 8 tags to 'java' imagestream
* SCL templates (aside from nodejs) use RHEL/CentOS/UBI 8 imagestream tags
* Fuse updated to 7.7
  • Loading branch information
yselkowitz committed Sep 3, 2020
1 parent 1327650 commit ce7405a
Show file tree
Hide file tree
Showing 110 changed files with 1,028 additions and 482 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "mysql:8.0",
"name": "mysql:8.0-el8",
"namespace": "${NAMESPACE}"
}
},
Expand Down Expand Up @@ -450,8 +450,8 @@
{
"name": "PHP_VERSION",
"displayName": "PHP Version",
"description": "Version of PHP image to be used (7.3 or latest).",
"value": "7.3",
"description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).",
"value": "7.3-ubi8",
"required": true
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "mysql:8.0",
"name": "mysql:8.0-el8",
"namespace": "${NAMESPACE}"
}
},
Expand Down Expand Up @@ -469,8 +469,8 @@
{
"name": "PHP_VERSION",
"displayName": "PHP Version",
"description": "Version of PHP image to be used (7.3 or latest).",
"value": "7.3",
"description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).",
"value": "7.3-ubi8",
"required": true
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "perl:5.26",
"name": "perl:5.26-ubi8",
"namespace": "${NAMESPACE}"
}
},
Expand Down Expand Up @@ -330,6 +330,10 @@
{
"name": "MYSQL_DATABASE",
"value": "${DATABASE_NAME}"
},
{
"name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
"value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}"
}
],
"image": " ",
Expand Down Expand Up @@ -388,7 +392,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "mysql:5.7",
"name": "mysql:8.0-el8",
"namespace": "${NAMESPACE}"
}
},
Expand Down Expand Up @@ -499,6 +503,12 @@
"name": "CPAN_MIRROR",
"displayName": "Custom CPAN Mirror URL",
"description": "The custom CPAN mirror URL"
},
{
"name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
"displayName": "MySQL authentication plugin",
"description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.",
"value": "mysql_native_password"
}
],
"labels": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "perl:5.26",
"name": "perl:5.26-ubi8",
"namespace": "${NAMESPACE}"
}
},
Expand Down Expand Up @@ -347,6 +347,10 @@
{
"name": "MYSQL_DATABASE",
"value": "${DATABASE_NAME}"
},
{
"name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
"value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}"
}
],
"image": " ",
Expand Down Expand Up @@ -407,7 +411,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "mysql:5.7",
"name": "mysql:8.0-el8",
"namespace": "${NAMESPACE}"
}
},
Expand Down Expand Up @@ -525,6 +529,12 @@
"name": "CPAN_MIRROR",
"displayName": "Custom CPAN Mirror URL",
"description": "The custom CPAN mirror URL"
},
{
"name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
"displayName": "MySQL authentication plugin",
"description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.",
"value": "mysql_native_password"
}
],
"labels": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -423,15 +423,15 @@
{
"name": "PYTHON_VERSION",
"displayName": "Version of Python Image",
"description": "Version of Python image to be used (3.6 or latest).",
"value": "3.6",
"description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).",
"value": "3.6-ubi8",
"required": true
},
{
"name": "POSTGRESQL_VERSION",
"displayName": "Version of PostgreSQL Image",
"description": "Version of PostgreSQL image to be used (10 or latest).",
"value": "10",
"description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).",
"value": "12-el8",
"required": true
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -442,15 +442,15 @@
{
"name": "PYTHON_VERSION",
"displayName": "Version of Python Image",
"description": "Version of Python image to be used (3.6 or latest).",
"value": "3.6",
"description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).",
"value": "3.6-ubi8",
"required": true
},
{
"name": "POSTGRESQL_VERSION",
"displayName": "Version of PostgreSQL Image",
"description": "Version of PostgreSQL image to be used (10 or latest).",
"value": "10",
"description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).",
"value": "12-el8",
"required": true
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"sourceStrategy": {
"from": {
"kind": "ImageStreamTag",
"name": "httpd:2.4",
"name": "httpd:2.4-el8",
"namespace": "${NAMESPACE}"
}
},
Expand Down
180 changes: 180 additions & 0 deletions assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "java",
"creationTimestamp": null,
"labels": {
"xpaas": "1.4.17"
},
"annotations": {
"openshift.io/display-name": "Red Hat OpenJDK",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"version": "1.4.17"
}
},
"spec": {
"lookupPolicy": {
"local": false
},
"tags": [
{
"name": "openjdk-8-ubi8",
"annotations": {
"description": "Build and run Java applications using Maven and OpenJDK 8.",
"iconClass": "icon-rh-openjdk",
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)",
"sampleContextDir": "undertow-servlet",
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
"supports": "java:8,java",
"tags": "builder,java,openjdk",
"version": "8"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/openjdk-8:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "openjdk-8-el7",
"annotations": {
"description": "Build and run Java applications using Maven and OpenJDK 8.",
"iconClass": "icon-rh-openjdk",
"openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL 7)",
"sampleContextDir": "undertow-servlet",
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
"supports": "java:8,java",
"tags": "builder,java,openjdk",
"version": "8"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "8",
"annotations": {
"description": "Build and run Java applications using Maven and OpenJDK 8.",
"iconClass": "icon-rh-openjdk",
"openshift.io/display-name": "Red Hat OpenJDK 8",
"sampleContextDir": "undertow-servlet",
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
"supports": "java:8,java",
"tags": "builder,java,openjdk,hidden",
"version": "8"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "openjdk-11-ubi8",
"annotations": {
"description": "Build and run Java applications using Maven and OpenJDK 11.",
"iconClass": "icon-rh-openjdk",
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)",
"sampleContextDir": "undertow-servlet",
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
"supports": "java:11,java",
"tags": "builder,java,openjdk",
"version": "11"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/openjdk-11:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "openjdk-11-el7",
"annotations": {
"description": "Build and run Java applications using Maven and OpenJDK 11.",
"iconClass": "icon-rh-openjdk",
"openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL 7)",
"sampleContextDir": "undertow-servlet",
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
"supports": "java:11,java",
"tags": "builder,java,openjdk",
"version": "11"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "11",
"annotations": {
"description": "Build and run Java applications using Maven and OpenJDK 11.",
"iconClass": "icon-rh-openjdk",
"openshift.io/display-name": "Red Hat OpenJDK 11",
"sampleContextDir": "undertow-servlet",
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
"supports": "java:11,java",
"tags": "builder,java,openjdk,hidden",
"version": "11"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "latest",
"annotations": {
"description": "Build and run Java applications using Maven.",
"iconClass": "icon-rh-openjdk",
"openshift.io/display-name": "Java (Latest)",
"sampleContextDir": "undertow-servlet",
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
"supports": "java",
"tags": "builder,java,openjdk",
"version": "latest"
},
"from": {
"kind": "ImageStreamTag",
"name": "openjdk-11-ubi8"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
},
"status": {
"dockerImageRepository": ""
}
}

0 comments on commit ce7405a

Please sign in to comment.