Skip to content

Commit 56b529e

Browse files
michaelguginomichaelgugino
committed
Fix examples image streams
Image streams older than 3.7 do not have a separate config for centos for dotnet_imagestreams.json This commit copies the new image stream to older supported verisons.
1 parent a4d4b53 commit 56b529e

File tree

2 files changed

+208
-0
lines changed

2 files changed

+208
-0
lines changed

‎roles/openshift_examples/files/examples/v1.5/image-streams/dotnet_imagestreams_centos.json

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"kind": "ImageStreamList",
3+
"apiVersion": "v1",
4+
"metadata": {
5+
"name": "dotnet-image-streams",
6+
"annotations": {
7+
"description": "ImageStream definitions for .NET Core on CentOS"
8+
}
9+
},
10+
"items": [
11+
{
12+
"kind": "ImageStream",
13+
"apiVersion": "v1",
14+
"metadata": {
15+
"name": "dotnet",
16+
"annotations": {
17+
"openshift.io/display-name": ".NET Core Builder Images"
18+
}
19+
},
20+
"spec": {
21+
"tags": [
22+
{
23+
"name": "latest",
24+
"annotations": {
25+
"openshift.io/display-name": ".NET Core (Latest)",
26+
"description": "Build and run .NET Core applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/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.",
27+
"iconClass": "icon-dotnet",
28+
"tags": "builder,.net,dotnet,dotnetcore",
29+
"supports":"dotnet",
30+
"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
31+
"sampleContextDir": "app",
32+
"sampleRef": "dotnetcore-2.0"
33+
},
34+
"from": {
35+
"kind": "ImageStreamTag",
36+
"name": "2.0"
37+
}
38+
},
39+
{
40+
"name": "2.0",
41+
"annotations": {
42+
"openshift.io/display-name": ".NET Core 2.0",
43+
"description": "Build and run .NET Core 2.0 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/build/README.md.",
44+
"iconClass": "icon-dotnet",
45+
"tags": "builder,.net,dotnet,dotnetcore,rh-dotnet20",
46+
"supports":"dotnet:2.0,dotnet",
47+
"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
48+
"sampleContextDir": "app",
49+
"sampleRef": "dotnetcore-2.0",
50+
"version": "2.0"
51+
},
52+
"from": {
53+
"kind": "DockerImage",
54+
"name": "registry.centos.org/dotnet/dotnet-20-centos7:latest"
55+
}
56+
}
57+
]
58+
}
59+
},
60+
{
61+
"kind": "ImageStream",
62+
"apiVersion": "v1",
63+
"metadata": {
64+
"name": "dotnet-runtime",
65+
"annotations": {
66+
"openshift.io/display-name": ".NET Core Runtime Images"
67+
}
68+
},
69+
"spec": {
70+
"tags": [
71+
{
72+
"name": "latest",
73+
"annotations": {
74+
"openshift.io/display-name": ".NET Core Runtime (Latest)",
75+
"description": "Run .NET Core applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/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.",
76+
"iconClass": "icon-dotnet",
77+
"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
78+
"supports":"dotnet-runtime"
79+
},
80+
"from": {
81+
"kind": "ImageStreamTag",
82+
"name": "2.0"
83+
}
84+
},
85+
{
86+
"name": "2.0",
87+
"annotations": {
88+
"openshift.io/display-name": ".NET Core 2.0 Runtime",
89+
"description": "Run .NET Core applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/runtime/README.md.",
90+
"iconClass": "icon-dotnet",
91+
"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
92+
"supports":"dotnet-runtime",
93+
"version": "2.0"
94+
},
95+
"from": {
96+
"kind": "DockerImage",
97+
"name": "registry.centos.org/dotnet/dotnet-20-runtime-centos7:latest"
98+
}
99+
}
100+
]
101+
}
102+
}
103+
]
104+
}

‎roles/openshift_examples/files/examples/v3.6/image-streams/dotnet_imagestreams_centos.json

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"kind": "ImageStreamList",
3+
"apiVersion": "v1",
4+
"metadata": {
5+
"name": "dotnet-image-streams",
6+
"annotations": {
7+
"description": "ImageStream definitions for .NET Core on CentOS"
8+
}
9+
},
10+
"items": [
11+
{
12+
"kind": "ImageStream",
13+
"apiVersion": "v1",
14+
"metadata": {
15+
"name": "dotnet",
16+
"annotations": {
17+
"openshift.io/display-name": ".NET Core Builder Images"
18+
}
19+
},
20+
"spec": {
21+
"tags": [
22+
{
23+
"name": "latest",
24+
"annotations": {
25+
"openshift.io/display-name": ".NET Core (Latest)",
26+
"description": "Build and run .NET Core applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/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.",
27+
"iconClass": "icon-dotnet",
28+
"tags": "builder,.net,dotnet,dotnetcore",
29+
"supports":"dotnet",
30+
"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
31+
"sampleContextDir": "app",
32+
"sampleRef": "dotnetcore-2.0"
33+
},
34+
"from": {
35+
"kind": "ImageStreamTag",
36+
"name": "2.0"
37+
}
38+
},
39+
{
40+
"name": "2.0",
41+
"annotations": {
42+
"openshift.io/display-name": ".NET Core 2.0",
43+
"description": "Build and run .NET Core 2.0 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/build/README.md.",
44+
"iconClass": "icon-dotnet",
45+
"tags": "builder,.net,dotnet,dotnetcore,rh-dotnet20",
46+
"supports":"dotnet:2.0,dotnet",
47+
"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
48+
"sampleContextDir": "app",
49+
"sampleRef": "dotnetcore-2.0",
50+
"version": "2.0"
51+
},
52+
"from": {
53+
"kind": "DockerImage",
54+
"name": "registry.centos.org/dotnet/dotnet-20-centos7:latest"
55+
}
56+
}
57+
]
58+
}
59+
},
60+
{
61+
"kind": "ImageStream",
62+
"apiVersion": "v1",
63+
"metadata": {
64+
"name": "dotnet-runtime",
65+
"annotations": {
66+
"openshift.io/display-name": ".NET Core Runtime Images"
67+
}
68+
},
69+
"spec": {
70+
"tags": [
71+
{
72+
"name": "latest",
73+
"annotations": {
74+
"openshift.io/display-name": ".NET Core Runtime (Latest)",
75+
"description": "Run .NET Core applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/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.",
76+
"iconClass": "icon-dotnet",
77+
"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
78+
"supports":"dotnet-runtime"
79+
},
80+
"from": {
81+
"kind": "ImageStreamTag",
82+
"name": "2.0"
83+
}
84+
},
85+
{
86+
"name": "2.0",
87+
"annotations": {
88+
"openshift.io/display-name": ".NET Core 2.0 Runtime",
89+
"description": "Run .NET Core applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/runtime/README.md.",
90+
"iconClass": "icon-dotnet",
91+
"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
92+
"supports":"dotnet-runtime",
93+
"version": "2.0"
94+
},
95+
"from": {
96+
"kind": "DockerImage",
97+
"name": "registry.centos.org/dotnet/dotnet-20-runtime-centos7:latest"
98+
}
99+
}
100+
]
101+
}
102+
}
103+
]
104+
}

0 commit comments

Comments
 (0)