Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Commit

Permalink
Reorder resources in template to avoid openshift/origin#4518
Browse files Browse the repository at this point in the history
  • Loading branch information
dtschan committed Aug 21, 2016
1 parent 3df7ed2 commit 6155d75
Showing 1 changed file with 115 additions and 112 deletions.
227 changes: 115 additions & 112 deletions template.json
Original file line number Diff line number Diff line change
@@ -1,125 +1,128 @@
{
"kind": "Template",
"apiVersion": "v1",
"metadata": {
"kind": "Template",
"apiVersion": "v1",
"metadata": {
"name": "appuio-docker-builder",
"creationTimestamp": null
},
"objects": [
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "appuio-docker-builder",
"creationTimestamp": null
},
"objects": [
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "appuio-docker-builder",
"creationTimestamp": null,
"labels": {
"app": "appuio-docker-builder"
},
"annotations": {
"openshift.io/generated-by": "OpenShiftNewApp"
}
},
"spec": {
"triggers": [
{
"type": "GitHub",
"github": {
"secret": "{GITHUB_WEBHOOK_SECRET}"
}
},
{
"type": "Generic",
"generic": {
"secret": "${GENERIC_WEBHOOK_SECRET}"
}
},
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChange": {}
}
],
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/appuio/appuio-docker-builder"
},
"secrets": [
{
"secret": {
"name": "secret-buildvm"
}
}
]
},
"strategy": {
"type": "Docker",
"dockerStrategy": {
"from": {
"kind": "ImageStreamTag",
"name": "rhel7:latest"
}
}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "appuio-docker-builder:latest"
}
},
"resources": {},
"postCommit": {}
},
"status": {
"lastVersion": 0
}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "appuio-docker-builder",
"generation": 1,
"creationTimestamp": null,
"labels": {
"app": "appuio-docker-builder"
},
"annotations": {
"openshift.io/generated-by": "OpenShiftNewApp"
}
},
"spec": {},
"status": {
"dockerImageRepository": ""
}
"generation": 1,
"creationTimestamp": null,
"labels": {
"app": "appuio-docker-builder"
},
{
"annotations": {
"openshift.io/generated-by": "OpenShiftNewApp"
}
},
"spec": {},
"status": {
"dockerImageRepository": ""
}
},
{
"apiVersion": "v1",
"kind": "ImageStream",
"metadata": {
"name": "rhel7"
"name": "rhel7",
"labels": {
"app": "appuio-docker-builder"
}
},
"spec": {
"dockerImageRepository": "registry.access.redhat.com/rhel7"
}
}
],
"parameters": [
{
"description": "GitHub trigger secret",
"name": "GITHUB_WEBHOOK_SECRET",
"from": "[a-zA-Z0-9]{8}",
"generate": "expression",
"required": true
},
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "appuio-docker-builder",
"creationTimestamp": null,
"labels": {
"app": "appuio-docker-builder"
},
{
"description": "Generic build trigger secret",
"name": "GENERIC_WEBHOOK_SECRET",
"from": "[a-zA-Z0-9]{8}",
"generate": "expression",
"required": true
"annotations": {
"openshift.io/generated-by": "OpenShiftNewApp"
}
]
},
"spec": {
"triggers": [
{
"type": "GitHub",
"github": {
"secret": "{GITHUB_WEBHOOK_SECRET}"
}
},
{
"type": "Generic",
"generic": {
"secret": "${GENERIC_WEBHOOK_SECRET}"
}
},
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChange": {}
}
],
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/appuio/appuio-docker-builder"
},
"secrets": [
{
"secret": {
"name": "secret-buildvm"
}
}
]
},
"strategy": {
"type": "Docker",
"dockerStrategy": {
"from": {
"kind": "ImageStreamTag",
"name": "rhel7:latest"
}
}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "appuio-docker-builder:latest"
}
},
"resources": {},
"postCommit": {}
},
"status": {
"lastVersion": 0
}
}
],
"parameters": [
{
"description": "GitHub trigger secret",
"name": "GITHUB_WEBHOOK_SECRET",
"from": "[a-zA-Z0-9]{8}",
"generate": "expression",
"required": true
},
{
"description": "Generic build trigger secret",
"name": "GENERIC_WEBHOOK_SECRET",
"from": "[a-zA-Z0-9]{8}",
"generate": "expression",
"required": true
}
]
}

0 comments on commit 6155d75

Please sign in to comment.