diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-06-30 16:51:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-30 16:51:00 -0400 |
commit | 31005495f571e02c671b90d2b4c0bb2d57fe4457 (patch) | |
tree | 4de7d3bf4363a2a88afc0e870baa5ad0b630c4da /roles/openshift_examples/files/examples/v1.4/xpaas-templates/datavirt63-basic-s2i.json | |
parent | a5e1e1fb2b068251c050722fd5f742dd3a92d93c (diff) | |
parent | 94feef04f73d970bb6ec45afa3629e368e6c7df6 (diff) | |
download | openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.gz openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.bz2 openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.xz openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.zip |
Merge pull request #4659 from sdodson/image-stream-sync
Sync all content
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.4/xpaas-templates/datavirt63-basic-s2i.json')
-rw-r--r-- | roles/openshift_examples/files/examples/v1.4/xpaas-templates/datavirt63-basic-s2i.json | 73 |
1 files changed, 69 insertions, 4 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/xpaas-templates/datavirt63-basic-s2i.json b/roles/openshift_examples/files/examples/v1.4/xpaas-templates/datavirt63-basic-s2i.json index 7d64dac98..ea2f13742 100644 --- a/roles/openshift_examples/files/examples/v1.4/xpaas-templates/datavirt63-basic-s2i.json +++ b/roles/openshift_examples/files/examples/v1.4/xpaas-templates/datavirt63-basic-s2i.json @@ -6,7 +6,8 @@ "iconClass": "icon-jboss", "description": "Application template for JBoss Data Virtualization 6.3 services built using S2I.", "tags": "jdv,datavirt,jboss,xpaas", - "version": "1.4.0" + "version": "1.4.0", + "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3 (no SSL)" }, "name": "datavirt63-basic-s2i" }, @@ -60,6 +61,7 @@ }, { "description": "The name of the service account to use for the deployment. The service account should be configured to allow usage of the secret specified by CONFIGURATION_NAME.", + "displayName": "Service Account Name", "name": "SERVICE_ACCOUNT_NAME", "value": "datavirt-service-account", "required": true @@ -133,6 +135,27 @@ "name": "AUTO_DEPLOY_EXPLODED", "value": "false", "required": false + }, + { + "description": "Comma delimited list of source directories containing VDBs for deployment", + "displayName": "VDB Deployment Directories", + "name": "VDB_DIRS", + "value": "", + "required": false + }, + { + "displayName": "Maven mirror URL", + "description": "Maven mirror to use for S2I builds", + "name": "MAVEN_MIRROR_URL", + "value": "", + "required": false + }, + { + "displayName": "Artifact Directories", + "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied.", + "name": "ARTIFACT_DIR", + "value": "", + "required": false } ], "objects": [ @@ -215,7 +238,22 @@ "uri": "${SOURCE_REPOSITORY_URL}", "ref": "${SOURCE_REPOSITORY_REF}" }, - "contextDir": "${CONTEXT_DIR}" + "contextDir": "${CONTEXT_DIR}", + "images": [ + { + "from": { + "kind": "ImageStreamTag", + "namespace": "${IMAGE_STREAM_NAMESPACE}", + "name": "jboss-datagrid65-client-openshift:1.0" + }, + "paths": [ + { + "destinationDir": "./${CONTEXT_DIR}/extensions/datagrid65", + "sourcePath": "/extensions/." + } + ] + } + ] }, "strategy": { "type": "Source", @@ -224,8 +262,26 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-datavirt63-openshift:1.0" - } + "name": "jboss-datavirt63-openshift:1.2" + }, + "env": [ + { + "name": "MAVEN_MIRROR_URL", + "value": "${MAVEN_MIRROR_URL}" + }, + { + "name": "CUSTOM_INSTALL_DIRECTORIES", + "value": "extensions/*" + }, + { + "name": "VDB_DIRS", + "value": "${VDB_DIRS}" + }, + { + "name": "ARTIFACT_DIR", + "value": "${ARTIFACT_DIR}" + } + ] } }, "output": { @@ -252,6 +308,15 @@ "imageChange": {} }, { + "type": "ImageChange", + "imageChange": { + "from": { + "kind": "ImageStreamTag", + "name": "jboss-datagrid65-client-openshift:1.0" + } + } + }, + { "type": "ConfigChange" } ] |