Merge pull request #46 from luck3y/update_64_build_config

[EAP 6.4] - Update OS image build for OSBS
jboss-container-images · Jan 16, 2019 · 95a6fb3 · 95a6fb3
2 parents 274e8c5 + 69269f3
commit 95a6fb3
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 6 deletions.
diff --git a/container.yaml b/container.yaml
@@ -0,0 +1,6 @@
+compose:
+  pulp_repos: true
+platforms:
+  only:
+  - x86_64
+
diff --git a/content_sets.yml b/content_sets.yml
@@ -0,0 +1,3 @@
+x86_64:
+- rhel-server-rhscl-7-rpms
+- rhel-7-server-rpms
diff --git a/cp-overrides.yaml b/cp-overrides.yaml
@@ -1,11 +1,17 @@
-from: "jboss-eap-6/eap64:cp"
-
 modules:
       repositories:
           - name: cct_module
             git:
                   url: https://github.com/jboss-openshift/cct_module.git
-                  ref: sprint-16
+                  ref: sprint-28
+          - name: jboss-eap-modules
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-modules
+                  ref: sprint-28
+          - name: jboss-eap-6-image
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-6-image.git
+                  ref: eap64-cp
 osbs:
       repository:
             name: containers/jboss-eap-6

diff --git a/dev-overrides.yaml b/dev-overrides.yaml
@@ -9,7 +9,10 @@ modules:
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules
                   ref: master
-
+          - name: jboss-eap-6-image
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-6-image.git
+                  ref: eap64-dev
 osbs:
       repository:
             name: containers/jboss-eap-6

diff --git a/image.yaml b/image.yaml
@@ -3,7 +3,7 @@ schema_version: 1
 name: "jboss-eap-6/eap64-openshift"
 description: "Red Hat JBoss Enterprise Application Platform 6.4 OpenShift container image"
 version: "1.9"
-from: "jboss-eap-6/eap64:latest"
+from: "rhel7:7-released"
 labels:
     - name: "com.redhat.component"
       value: "jboss-eap-6-eap64-openshift-container"
@@ -33,7 +33,14 @@ modules:
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
                   ref: master
+          - name: jboss-eap-6-image
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-6-image.git
+                  ref: eap64
       install:
+          - name: jboss.container.openjdk.jdk
+            version: "8"
+          - name: eap-6.4-latest
           - name: dynamic-resources
           - name: s2i-common
           - name: java-alternatives
@@ -64,7 +71,19 @@ modules:
           - name: os-logging
           - name: jboss.container.eap.prometheus.config
             version: '6.4'
+packages:
+      content_sets_file: content_sets.yml
+      install:
+          - python-requests
+          - python-enum34
+          - PyYAML
+run:
+      user: 185
+      cmd:
+          - "/opt/eap/bin/openshift-launch.sh"
 osbs:
+      configuration:
+            container_file: container.yaml
       repository:
             name: containers/jboss-eap-6
             branch: jb-eap-6.4-openshift-rhel-7
diff --git a/rel-overrides.yaml b/rel-overrides.yaml
@@ -4,7 +4,15 @@ modules:
           - name: cct_module
             git:
                   url: https://github.com/jboss-openshift/cct_module.git
-                  ref: sprint-16
+                  ref: sprint-28
+          - name: jboss-eap-modules
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-modules
+                  ref: sprint-28
+          - name: jboss-eap-6-image
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-6-image.git
+                  ref: eap64
 osbs:
       repository:
             name: containers/jboss-eap-6