Merge pull request #55 from jfdenise/18.0

WF s2i 18
wildfly · Oct 4, 2019 · 0788b4e · 0788b4e
2 parents e78b6c4 + cd09bd1
commit 0788b4e
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-IMAGE_VERSION=dev
+IMAGE_VERSION=18.0
 NAMESPACE=wildfly
 PLATFORM=centos7
 IMAGE_NAME=${NAMESPACE}/wildfly-${PLATFORM}

diff --git a/imagestreams/wildfly-centos7.json b/imagestreams/wildfly-centos7.json
@@ -247,6 +247,26 @@
           "type": "Local"
         },
         "name": "17.0"
+      },
+      {
+        "annotations": {
+          "description": "Build and run WildFly 18 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.",
+          "iconClass": "icon-wildfly",
+          "openshift.io/display-name": "WildFly 18",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
+          "supports": "wildfly:18,jee,java",
+          "tags": "builder,wildfly,java",
+          "version": "18.0"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "quay.io/wildfly/wildfly-centos7:18.0"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        },
+        "name": "18.0"
       }
     ]
   }

diff --git a/imagestreams/wildfly-runtime-centos7.json b/imagestreams/wildfly-runtime-centos7.json
@@ -11,7 +11,7 @@
     "tags": [
       {
         "annotations": {
-          "description": "WildFly 17 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.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of WildFly available on OpenShift, including major versions updates.",
+          "description": "WildFly 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.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of WildFly available on OpenShift, including major versions updates.",
           "iconClass": "icon-wildfly",
           "openshift.io/display-name": "WildFly Runtime Dependencies (Latest)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
@@ -45,6 +45,25 @@
           "type": "Local"
         },
         "name": "17.0"
+      },
+      {
+        "annotations": {
+          "description": "WildFly 18 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.",
+          "iconClass": "icon-wildfly",
+          "openshift.io/display-name": "WildFly Runtime Dependencies 18",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "supports": "wildfly:18,jee,java",
+          "tags": "wildfly,java",
+          "version": "18.0"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "quay.io/wildfly/wildfly-runtime-centos7:18.0"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        },
+        "name": "18.0"
       }
     ]
   }

diff --git a/templates/wildfly-builder-imagestream.yml b/templates/wildfly-builder-imagestream.yml
@@ -17,13 +17,13 @@ spec:
     from:
       kind: DockerImage
       name: "quay.io/jfdenise/wildfly-centos7:latest"
-  - name: "17.0"
+  - name: "18.0"
     annotations:
       description: wildfly-builder image stream
       iconClass: icon-wildfly
       tags: builder,java,widlfly,galleon
       sampleRepo: https://github.com/openshift/openshift-jee-sample.git
-      version: '17.0'
+      version: '18.0'
     from:
       kind: DockerImage
-      name: "quay.io/jfdenise/wildfly-centos7:17.0"
+      name: "quay.io/jfdenise/wildfly-centos7:18.0"
diff --git a/templates/wildfly-runtime-imagestream.yml b/templates/wildfly-runtime-imagestream.yml
@@ -14,12 +14,12 @@ spec:
     from:
       kind: DockerImage
       name: "quay.io/jfdenise/wildfly-runtime-centos7:latest"
-  - name: "17.0"
+  - name: "18.0"
     annotations:
       description: wildfly-runtime image stream
       iconClass: icon-wildfly
       tags: java,widlfly
-      version: '17.0'
+      version: '18.0'
     from:
       kind: DockerImage
-      name: "quay.io/jfdenise/wildfly-runtime-centos7:17.0"
+      name: "quay.io/jfdenise/wildfly-runtime-centos7:18.0"
diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
@@ -2,7 +2,7 @@ schema_version: 1
 
 name: &imgName "wildfly/wildfly-centos7"
 description: "The WildFly s2i image"
-version: &imgVersion "dev"
+version: &imgVersion "18.0"
 from: "centos/s2i-base-centos7"
 labels:
     - name: io.k8s.description
@@ -34,7 +34,7 @@ modules:
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: master
+              ref: wf-18.0
           - name: wildfly-s2i-modules
             path: ../wildfly-modules
       install:

diff --git a/wildfly-runtime-image/image.yaml b/wildfly-runtime-image/image.yaml
@@ -2,7 +2,7 @@ schema_version: 1
 
 name: &imgName "wildfly/wildfly-runtime-centos7"
 description: "The WildFly runtime image"
-version: &imgVersion "dev"
+version: &imgVersion "18.0"
 from: "centos:7"
 labels:
     - name: io.openshift.expose-services