Skip to content

Commit

Permalink
[RHPAM-1435] CE build alignment for EAP-based OpenShift images in RHP…
Browse files Browse the repository at this point in the history
…AM (#122)

[RHPAM-1435] CE build alignment for EAP-based OpenShift images in RHPAM
  • Loading branch information
errantepiphany committed Aug 17, 2018
1 parent fa5e0a2 commit 2eba1bc
Show file tree
Hide file tree
Showing 31 changed files with 582 additions and 817 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Thanks for submitting your Pull Request!

Please make sure your PR meets the following requirements:

- [ ] Pull Request title is properly formatted: `[CLOUD-XYA] Subject`
- [ ] Pull Request title is properly formatted: `[RHPAM-XYZ] Subject`
- [ ] Pull Request contains link to the JIRA issue
- [ ] Pull Request contains description of the issue
- [ ] Pull Request does not include fixes for issues other than the main ticket
Expand Down
25 changes: 15 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
*.class
*.ear
*.iml
*.ipr
*.iws
*.jar
*.war
*~
.DS_Store
atlassian*
.checkstyle
*.class
.classpath
deployments
.DS_Store
*.ear
.factorypath
.fbExcludeFilterFile
hs_err_pid*
.idea/
*.iml
*.ipr
*.iws
*.jar
.metadata/
.mtj.tmp/
my*image-streams.yaml
my*overrides.yaml
.project
.settings/
atlassian*
hs_err_pid*
target
target/
venv/
*.war
17 changes: 17 additions & 0 deletions businesscentral-indexing/cp-overrides.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
schema_version: 1

from: "rhpam-7/rhpam71-businesscentral-indexing:7.1.0"
modules:
repositories:
- name: cct_module
git:
url: https://github.com/jboss-openshift/cct_module.git
ref: sprint-22
- name: jboss-kie-modules
git:
url: https://github.com/jboss-container-images/jboss-kie-modules.git
ref: rhpam-7.1.0.GA
osbs:
repository:
name: containers/rhpam-7-businesscentral-indexing-openshift
branch: jb-rhpam-7.1-businesscentral-indexing-openshift-cp-rhel-7
17 changes: 17 additions & 0 deletions businesscentral-indexing/dev-overrides.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
schema_version: 1

from: "rhpam-7/rhpam71-businesscentral-indexing:latest"
modules:
repositories:
- name: cct_module
git:
url: https://github.com/jboss-openshift/cct_module.git
ref: master
- name: jboss-kie-modules
git:
url: https://github.com/jboss-container-images/jboss-kie-modules.git
ref: master
osbs:
repository:
name: containers/rhpam-7-businesscentral-indexing-openshift
branch: jb-rhpam-7.1-businesscentral-indexing-openshift-dev-rhel-7
40 changes: 21 additions & 19 deletions businesscentral-indexing/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,12 @@ labels:
- name: "io.openshift.tags"
value: "javaee,rhpam,rhdm,rhpam7,rhdm7"
envs:
- name: "SCRIPT_DEBUG"
example: "true"
description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed."
- name: "ES_CLUSTER_NAME"
example: "kie-cluster"
description: "Sets the ES cluster.name property. Defaults to kie-cluster."
- name: "ES_NODE_NAME"
example: "nodeName"
description: "Sets the ES node.name property. Defaults to HOSTNAME env value."
- name: "ES_TRANSPORT_HOST"
example: "10.10.10.10"
description: "Sets the ES transport.host property. This will set the transport address of the main ES cluster node. Used for communication between nodes in the cluster. Defaults to container address."
- name: "ES_TRANSPORT_TCP_PORT"
example: "9300"
description: "Sets the ES http.host property. This will set the http address of the main ES cluster node. Used for communication between nodes in the cluster."
- name: "ES_HTTP_HOST"
example: "0.0.0.0"
description: "Sets the ES http.host property. This will set the http address of the main ES cluster node. Used to interact with cluster rest api. Defaults to the container ip address"
Expand All @@ -37,22 +31,30 @@ envs:
- name: "ES_JAVA_OPTS"
example: "-Xms1024m -Xmx1024m"
description: "Appends custom jvm configurations/properties to ES jvm.options configuration file."
- name: "SCRIPT_DEBUG"
example: "true"
description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed."
- name: "ES_NODE_NAME"
example: "nodeName"
description: "Sets the ES node.name property. Defaults to HOSTNAME env value."
- name: "ES_TRANSPORT_HOST"
example: "10.10.10.10"
description: "Sets the ES transport.host property. This will set the transport address of the main ES cluster node. Used for communication between nodes in the cluster. Defaults to container address."
- name: "ES_TRANSPORT_TCP_PORT"
example: "9300"
description: "Sets the ES http.host property. This will set the http address of the main ES cluster node. Used for communication between nodes in the cluster."
ports:
- value: 9200
- value: 9300
modules:
repositories:
- git:
url: https://github.com/jboss-openshift/cct_module.git
ref: sprint-18
- git:
url: https://github.com/jboss-container-images/jboss-kie-modules.git
ref: master
- name: cct_module
git:
url: https://github.com/jboss-openshift/cct_module.git
ref: master
- name: jboss-kie-modules
git:
url: https://github.com/jboss-container-images/jboss-kie-modules.git
ref: master
install:
- name: os.bpmsuite.elasticsearch
- name: jboss.kie.workbench-indexing
- name: dynamic-resources
- name: java-alternatives
- name: os-java-run
Expand Down
17 changes: 17 additions & 0 deletions businesscentral-indexing/rel-overrides.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
schema_version: 1

from: "rhpam-7/rhpam71-businesscentral-indexing:7.1.0"
modules:
repositories:
- name: cct_module
git:
url: https://github.com/jboss-openshift/cct_module.git
ref: sprint-22
- name: jboss-kie-modules
git:
url: https://github.com/jboss-container-images/jboss-kie-modules.git
ref: rhpam-7.1.0.GA
osbs:
repository:
name: containers/rhpam-7-businesscentral-indexing-openshift
branch: jb-rhpam-7.1-businesscentral-indexing-openshift-rhel-7
21 changes: 21 additions & 0 deletions businesscentral-monitoring/cp-overrides.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
schema_version: 1

from: "rhpam-7/rhpam71-businesscentral-monitoring:7.1.0"
modules:
repositories:
- name: cct_module
git:
url: https://github.com/jboss-openshift/cct_module.git
ref: sprint-22
- name: jboss-eap-modules
git:
url: https://github.com/jboss-container-images/jboss-eap-modules.git
ref: sprint-22
- name: jboss-kie-modules
git:
url: https://github.com/jboss-container-images/jboss-kie-modules.git
ref: rhpam-7.1.0.GA
osbs:
repository:
name: containers/rhpam-7-businesscentral-monitoring-openshift
branch: jb-rhpam-7.1-businesscentral-monitoring-openshift-cp-rhel-7
21 changes: 21 additions & 0 deletions businesscentral-monitoring/dev-overrides.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
schema_version: 1

from: "rhpam-7/rhpam71-businesscentral-monitoring:latest"
modules:
repositories:
- name: cct_module
git:
url: https://github.com/jboss-openshift/cct_module.git
ref: master
- name: jboss-eap-modules
git:
url: https://github.com/jboss-container-images/jboss-eap-modules.git
ref: master
- name: jboss-kie-modules
git:
url: https://github.com/jboss-container-images/jboss-kie-modules.git
ref: master
osbs:
repository:
name: containers/rhpam-7-businesscentral-monitoring-openshift
branch: jb-rhpam-7.1-businesscentral-monitoring-openshift-dev-rhel-7

0 comments on commit 2eba1bc

Please sign in to comment.