Skip to content

Commit

Permalink
Add rhel8 based imagestreams (#278)
Browse files Browse the repository at this point in the history
* Add rhel8 based imagestreams
  • Loading branch information
aslicerh committed Jun 14, 2019
1 parent 015eedb commit 127681d
Show file tree
Hide file tree
Showing 3 changed files with 124 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dotnet_imagestreams.json
Expand Up @@ -4,7 +4,7 @@
"metadata": {
"name": "dotnet-image-streams",
"annotations": {
"description": "ImageStream definitions for .NET Core on RHEL"
"description": "ImageStream definitions for .NET Core on RHEL 7"
}
},
"items": [
Expand Down
116 changes: 116 additions & 0 deletions dotnet_imagestreams_rhel8.json
@@ -0,0 +1,116 @@
{
"kind": "ImageStreamList",
"apiVersion": "v1",
"metadata": {
"name": "dotnet-image-streams",
"annotations": {
"description": "ImageStream definitions for .NET Core on RHEL 8"
}
},
"items": [
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "dotnet",
"annotations": {
"openshift.io/display-name": ".NET Core"
}
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": {
"openshift.io/display-name": ".NET Core (Latest)",
"description": "Build and run .NET Core applications on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core available on OpenShift, including major versions updates.",
"iconClass": "icon-dotnet",
"tags": "builder,.net,dotnet,dotnetcore",
"supports": "dotnet",
"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
"sampleContextDir": "app",
"sampleRef": "dotnetcore-2.1"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "ImageStreamTag",
"name": "2.1"
}
},
{
"name": "2.1",
"annotations": {
"openshift.io/display-name": ".NET Core 2.1",
"description": "Build and run .NET Core 2.1 applications on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/build/README.md.",
"iconClass": "icon-dotnet",
"tags": "builder,.net,dotnet,dotnetcore,dotnet21",
"supports": "dotnet:2.1,dotnet",
"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
"sampleContextDir": "app",
"sampleRef": "dotnetcore-2.1",
"version": "2.1"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi8/dotnet-21:2.1"
}
}
]
}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "dotnet-runtime",
"annotations": {
"openshift.io/display-name": ".NET Core Runtime"
}
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": {
"openshift.io/display-name": ".NET Core Runtime (Latest)",
"description": "Run .NET Core applications on RHEL 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.",
"iconClass": "icon-dotnet",
"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
"supports": "dotnet-runtime"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "ImageStreamTag",
"name": "2.1"
}
},
{
"name": "2.1",
"annotations": {
"openshift.io/display-name": ".NET Core 2.1 Runtime",
"description": "Run .NET Core applications on RHEL 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/runtime/README.md.",
"iconClass": "icon-dotnet",
"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
"supports": "dotnet-runtime",
"version": "2.1"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi8/dotnet-21-runtime:2.1"
}
}
]
}
}
]
}
9 changes: 7 additions & 2 deletions install-imagestreams.sh
Expand Up @@ -45,7 +45,7 @@ show_help() {
echo "$script_name is a script for installing/updating/removing .NET S2I streams."
echo ""
echo "Options:"
echo " --o,--os Installs image streams based on this distro ('rhel7', or 'centos7')."
echo " --o,--os Installs image streams based on this distro ('rhel7', 'rhel8', or 'centos7')."
echo " --n,--namespace Namespace to add imagestreams to. Defaults to current 'oc' project."
echo " Set this to 'openshift' to install globally (requires admin priviledges)."
echo " --rm Remove the image streams."
Expand Down Expand Up @@ -159,8 +159,13 @@ do
registry_requires_auth=true
registry="registry.redhat.io"
;;
"rhel8")
imagestreams_url="https://raw.githubusercontent.com/redhat-developer/s2i-dotnetcore/master/dotnet_imagestreams_rhel8.json"
registry_requires_auth=false
registry="registry.access.redhat.com"
;;
*)
say_err "Unsupported value for --os: '$os'. Valid values are 'centos7' and 'rhel7'."
say_err "Unsupported value for --os: '$os'. Valid values are 'centos7', 'rhel7', and 'rhel8'."
exit 1
;;
esac
Expand Down

0 comments on commit 127681d

Please sign in to comment.