Update template filenames to not collide with EAP 72 JDK 8

jboss-container-images · May 6, 2019 · 0e7e08b · 0e7e08b
1 parent ce6cb34
commit 0e7e08b
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 78 deletions.
diff --git a/dev-overrides.yaml b/dev-overrides.yaml
@@ -8,8 +8,8 @@ modules:
                   ref: master
           - name: jboss-eap-modules
             git:
-                  url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: eap72-openjdk11-ubi8-1
+                  url: https://github.com/luck3y/jboss-eap-modules.git
+                  ref: 7.2.x-openjdk11
           - name: jboss-eap-7-image
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-7-image.git
@@ -23,4 +23,6 @@ osbs:
           compose:
             pulp_repos: true
             include_unpublished_pulp_repos: true
+            packages:
+             - tzdata-java
 
diff --git a/image.yaml b/image.yaml
@@ -63,8 +63,6 @@ modules:
           - name: os-eap-launch
           - name: os-eap7-launch
           - name: jboss.eap.cd.openshift.launch
-          - name: os-eap-datasource
-            version: "1.0"
           - name: jboss.eap.cd.logging
           - name: jboss.eap.config.mp-config
           - name: jboss.eap.config.jgroups

diff --git a/templates/eap72-image-stream.json b/templates/eap72-image-stream.json
diff --git a/templates/eap72-amq-persistent-s2i.json → ...s/eap72-openjdk11-amq-persistent-s2i.json b/templates/eap72-amq-persistent-s2i.json → ...s/eap72-openjdk11-amq-persistent-s2i.json
diff --git a/templates/eap72-amq-s2i.json → templates/eap72-openjdk11-amq-s2i.json b/templates/eap72-amq-s2i.json → templates/eap72-openjdk11-amq-s2i.json
diff --git a/templates/eap72-basic-s2i.json → templates/eap72-openjdk11-basic-s2i.json b/templates/eap72-basic-s2i.json → templates/eap72-openjdk11-basic-s2i.json
diff --git a/templates/eap72-https-s2i.json → templates/eap72-openjdk11-https-s2i.json b/templates/eap72-https-s2i.json → templates/eap72-openjdk11-https-s2i.json
diff --git a/templates/eap72-sso-s2i.json → templates/eap72-openjdk11-sso-s2i.json b/templates/eap72-sso-s2i.json → templates/eap72-openjdk11-sso-s2i.json
diff --git a/templates/eap72-starter-s2i.json → templates/eap72-openjdk11-starter-s2i.json b/templates/eap72-starter-s2i.json → templates/eap72-openjdk11-starter-s2i.json
diff --git a/templates/eap72-third-party-db-s2i.json → ...s/eap72-openjdk11-third-party-db-s2i.json b/templates/eap72-third-party-db-s2i.json → ...s/eap72-openjdk11-third-party-db-s2i.json
diff --git a/templates/eap72-tx-recovery-s2i.json → ...ates/eap72-openjdk11-tx-recovery-s2i.json b/templates/eap72-tx-recovery-s2i.json → ...ates/eap72-openjdk11-tx-recovery-s2i.json