Skip to content

Commit 8e6d299

Browse files
author
OpenShift Bot
authored
Merge pull request #9610 from bparees/scl_images
Merged by openshift-bot
2 parents 8aaba51 + 40fa39e commit 8e6d299

File tree

4 files changed

+462
-102
lines changed

4 files changed

+462
-102
lines changed

‎examples/image-streams/image-streams-centos7.json

Lines changed: 106 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
"kind": "ImageStream",
88
"apiVersion": "v1",
99
"metadata": {
10-
"name": "ruby",
11-
"creationTimestamp": null
10+
"name": "ruby"
1211
},
1312
"spec": {
1413
"tags": [
@@ -23,7 +22,7 @@
2322
},
2423
"from": {
2524
"kind": "ImageStreamTag",
26-
"name": "2.2"
25+
"name": "2.3"
2726
}
2827
},
2928
{
@@ -55,6 +54,21 @@
5554
"kind": "DockerImage",
5655
"name": "centos/ruby-22-centos7:latest"
5756
}
57+
},
58+
{
59+
"name": "2.3",
60+
"annotations": {
61+
"description": "Build and run Ruby 2.3 applications",
62+
"iconClass": "icon-ruby",
63+
"tags": "builder,ruby",
64+
"supports": "ruby:2.3,ruby",
65+
"version": "2.3",
66+
"sampleRepo": "https://github.com/openshift/ruby-ex.git"
67+
},
68+
"from": {
69+
"kind": "DockerImage",
70+
"name": "centos/ruby-23-centos7:latest"
71+
}
5872
}
5973
]
6074
}
@@ -63,8 +77,7 @@
6377
"kind": "ImageStream",
6478
"apiVersion": "v1",
6579
"metadata": {
66-
"name": "nodejs",
67-
"creationTimestamp": null
80+
"name": "nodejs"
6881
},
6982
"spec": {
7083
"tags": [
@@ -104,8 +117,7 @@
104117
"kind": "ImageStream",
105118
"apiVersion": "v1",
106119
"metadata": {
107-
"name": "perl",
108-
"creationTimestamp": null
120+
"name": "perl"
109121
},
110122
"spec": {
111123
"tags": [
@@ -161,8 +173,7 @@
161173
"kind": "ImageStream",
162174
"apiVersion": "v1",
163175
"metadata": {
164-
"name": "php",
165-
"creationTimestamp": null
176+
"name": "php"
166177
},
167178
"spec": {
168179
"tags": [
@@ -217,8 +228,7 @@
217228
"kind": "ImageStream",
218229
"apiVersion": "v1",
219230
"metadata": {
220-
"name": "python",
221-
"creationTimestamp": null
231+
"name": "python"
222232
},
223233
"spec": {
224234
"tags": [
@@ -233,7 +243,7 @@
233243
},
234244
"from": {
235245
"kind": "ImageStreamTag",
236-
"name": "3.4"
246+
"name": "3.5"
237247
}
238248
},
239249
{
@@ -280,6 +290,21 @@
280290
"kind": "DockerImage",
281291
"name": "centos/python-34-centos7:latest"
282292
}
293+
},
294+
{
295+
"name": "3.5",
296+
"annotations": {
297+
"description": "Build and run Python 3.5 applications",
298+
"iconClass": "icon-python",
299+
"tags": "builder,python",
300+
"supports":"python:3.5,python",
301+
"version": "3.5",
302+
"sampleRepo": "https://github.com/openshift/django-ex.git"
303+
},
304+
"from": {
305+
"kind": "DockerImage",
306+
"name": "centos/python-35-centos7:latest"
307+
}
283308
}
284309
]
285310
}
@@ -288,8 +313,7 @@
288313
"kind": "ImageStream",
289314
"apiVersion": "v1",
290315
"metadata": {
291-
"name": "wildfly",
292-
"creationTimestamp": null
316+
"name": "wildfly"
293317
},
294318
"spec": {
295319
"tags": [
@@ -359,8 +383,7 @@
359383
"kind": "ImageStream",
360384
"apiVersion": "v1",
361385
"metadata": {
362-
"name": "mysql",
363-
"creationTimestamp": null
386+
"name": "mysql"
364387
},
365388
"spec": {
366389
"tags": [
@@ -409,8 +432,43 @@
409432
"kind": "ImageStream",
410433
"apiVersion": "v1",
411434
"metadata": {
412-
"name": "postgresql",
413-
"creationTimestamp": null
435+
"name": "mariadb"
436+
},
437+
"spec": {
438+
"tags": [
439+
{
440+
"name": "latest",
441+
"annotations": {
442+
"description": "Provides a MariaDB database",
443+
"iconClass": "icon-mariadb",
444+
"tags": "mariadb"
445+
},
446+
"from": {
447+
"kind": "ImageStreamTag",
448+
"name": "10.1"
449+
}
450+
},
451+
{
452+
"name": "10.1",
453+
"annotations": {
454+
"description": "Provides a MariaDB v10.1 database",
455+
"iconClass": "icon-mariadb",
456+
"tags": "mariadb",
457+
"version": "10.1"
458+
},
459+
"from": {
460+
"kind": "DockerImage",
461+
"name": "centos/mariadb-101-centos7:latest"
462+
}
463+
}
464+
]
465+
}
466+
},
467+
{
468+
"kind": "ImageStream",
469+
"apiVersion": "v1",
470+
"metadata": {
471+
"name": "postgresql"
414472
},
415473
"spec": {
416474
"tags": [
@@ -423,7 +481,7 @@
423481
},
424482
"from": {
425483
"kind": "ImageStreamTag",
426-
"name": "9.4"
484+
"name": "9.5"
427485
}
428486
},
429487
{
@@ -451,6 +509,19 @@
451509
"kind": "DockerImage",
452510
"name": "centos/postgresql-94-centos7:latest"
453511
}
512+
},
513+
{
514+
"name": "9.5",
515+
"annotations": {
516+
"description": "Provides a PostgreSQL v9.5 database",
517+
"iconClass": "icon-postgresql",
518+
"tags": "postgresql",
519+
"version": "9.5"
520+
},
521+
"from": {
522+
"kind": "DockerImage",
523+
"name": "centos/postgresql-95-centos7:latest"
524+
}
454525
}
455526
]
456527
}
@@ -459,8 +530,7 @@
459530
"kind": "ImageStream",
460531
"apiVersion": "v1",
461532
"metadata": {
462-
"name": "mongodb",
463-
"creationTimestamp": null
533+
"name": "mongodb"
464534
},
465535
"spec": {
466536
"tags": [
@@ -473,7 +543,7 @@
473543
},
474544
"from": {
475545
"kind": "ImageStreamTag",
476-
"name": "2.6"
546+
"name": "3.2"
477547
}
478548
},
479549
{
@@ -501,6 +571,19 @@
501571
"kind": "DockerImage",
502572
"name": "centos/mongodb-26-centos7:latest"
503573
}
574+
},
575+
{
576+
"name": "3.2",
577+
"annotations": {
578+
"description": "Provides a MongoDB v3.2 database",
579+
"iconClass": "icon-mongodb",
580+
"tags": "mongodb",
581+
"version": "3.2"
582+
},
583+
"from": {
584+
"kind": "DockerImage",
585+
"name": "centos/mongodb-32-centos7:latest"
586+
}
504587
}
505588
]
506589
}
@@ -509,8 +592,7 @@
509592
"kind": "ImageStream",
510593
"apiVersion": "v1",
511594
"metadata": {
512-
"name": "jenkins",
513-
"creationTimestamp": null
595+
"name": "jenkins"
514596
},
515597
"spec": {
516598
"tags": [

0 commit comments

Comments
 (0)