Skip to content

Commit 6b54751

Browse files
authored
Merge pull request #94 from jfdenise/wf19-final
Wf19 final
2 parents 84992e7 + 8283411 commit 6b54751

File tree

7 files changed

+49
-10
lines changed

7 files changed

+49
-10
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
IMAGE_VERSION=dev
1+
IMAGE_VERSION=19.0
22
NAMESPACE=wildfly
33
PLATFORM=centos7
44
IMAGE_NAME=${NAMESPACE}/wildfly-${PLATFORM}

imagestreams/wildfly-centos7.json

+20
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,26 @@
267267
"type": "Local"
268268
},
269269
"name": "18.0"
270+
},
271+
{
272+
"annotations": {
273+
"description": "Build and run WildFly 19 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.",
274+
"iconClass": "icon-wildfly",
275+
"openshift.io/display-name": "WildFly 19",
276+
"openshift.io/provider-display-name": "Red Hat, Inc.",
277+
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
278+
"supports": "wildfly:19,jee,java",
279+
"tags": "builder,wildfly,java",
280+
"version": "19.0"
281+
},
282+
"from": {
283+
"kind": "DockerImage",
284+
"name": "quay.io/wildfly/wildfly-centos7:19.0"
285+
},
286+
"referencePolicy": {
287+
"type": "Local"
288+
},
289+
"name": "19.0"
270290
}
271291
]
272292
}

imagestreams/wildfly-runtime-centos7.json

+19
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,25 @@
6464
"type": "Local"
6565
},
6666
"name": "18.0"
67+
},
68+
{
69+
"annotations": {
70+
"description": "WildFly 19 runtime dependencies image based on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.",
71+
"iconClass": "icon-wildfly",
72+
"openshift.io/display-name": "WildFly Runtime Dependencies 19",
73+
"openshift.io/provider-display-name": "Red Hat, Inc.",
74+
"supports": "wildfly:19,jee,java",
75+
"tags": "wildfly,java",
76+
"version": "19.0"
77+
},
78+
"from": {
79+
"kind": "DockerImage",
80+
"name": "quay.io/wildfly/wildfly-runtime-centos7:19.0"
81+
},
82+
"referencePolicy": {
83+
"type": "Local"
84+
},
85+
"name": "19.0"
6786
}
6887
]
6988
}

templates/wildfly-builder-imagestream.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ spec:
1717
from:
1818
kind: DockerImage
1919
name: "quay.io/wildfly/wildfly-centos7:latest"
20-
- name: "18.0"
20+
- name: "19.0"
2121
annotations:
2222
description: wildfly-builder image stream
2323
iconClass: icon-wildfly
2424
tags: builder,java,widlfly,galleon
2525
sampleRepo: https://github.com/openshift/openshift-jee-sample.git
26-
version: '18.0'
26+
version: '19.0'
2727
from:
2828
kind: DockerImage
29-
name: "quay.io/wildfly/wildfly-centos7:18.0"
29+
name: "quay.io/wildfly/wildfly-centos7:19.0"

templates/wildfly-runtime-imagestream.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ spec:
1414
from:
1515
kind: DockerImage
1616
name: "quay.io/wildfly/wildfly-runtime-centos7:latest"
17-
- name: "18.0"
17+
- name: "19.0"
1818
annotations:
1919
description: wildfly-runtime image stream
2020
iconClass: icon-wildfly
2121
tags: java,widlfly
22-
version: '18.0'
22+
version: '19.0'
2323
from:
2424
kind: DockerImage
25-
name: "quay.io/wildfly/wildfly-runtime-centos7:18.0"
25+
name: "quay.io/wildfly/wildfly-runtime-centos7:19.0"

wildfly-builder-image/image.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ schema_version: 1
22

33
name: &imgName "wildfly/wildfly-centos7"
44
description: "The WildFly s2i image"
5-
version: &imgVersion "dev"
5+
version: &imgVersion "19.0"
66
from: "centos/s2i-base-centos7"
77
labels:
88
- name: io.k8s.description
@@ -34,7 +34,7 @@ modules:
3434
- name: wildfly-cekit-modules
3535
git:
3636
url: https://github.com/wildfly/wildfly-cekit-modules
37-
ref: master
37+
ref: 0.19.0
3838
- name: wildfly-s2i-modules
3939
path: ../wildfly-modules
4040
install:

wildfly-runtime-image/image.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ schema_version: 1
22

33
name: &imgName "wildfly/wildfly-runtime-centos7"
44
description: "The WildFly runtime image"
5-
version: &imgVersion "dev"
5+
version: &imgVersion "19.0"
66
from: "centos:7"
77
labels:
88
- name: io.openshift.expose-services

0 commit comments

Comments
 (0)