diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-07-24 14:44:42 -0400 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-07-24 14:44:42 -0400 |
commit | cd46a239484bb67c29cdffdad01f467183ff9653 (patch) | |
tree | c0a8845cc82438318e21fa9712b2fede3860c11f /roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json | |
parent | d926c3f12fee5f63debd129498b7f91767e52451 (diff) | |
parent | c48affb811a70cf3e5b7dc9029577d26da4f0de7 (diff) | |
download | openshift-cd46a239484bb67c29cdffdad01f467183ff9653.tar.gz openshift-cd46a239484bb67c29cdffdad01f467183ff9653.tar.bz2 openshift-cd46a239484bb67c29cdffdad01f467183ff9653.tar.xz openshift-cd46a239484bb67c29cdffdad01f467183ff9653.zip |
Merge pull request #390 from sdodson/updated-examples
Updated examples content
Diffstat (limited to 'roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json')
-rw-r--r-- | roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json index 6040f7208..4f4b2ba44 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json @@ -284,24 +284,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -372,12 +373,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -502,7 +503,6 @@ "image": "postgresql", "ports": [ { - "name": "${APPLICATION_NAME}-postgresql-tcp-5432", "containerPort": 5432, "protocol": "TCP" } |