From f72b7979a91498ffe43fc70b675f1890f6bcdacf Mon Sep 17 00:00:00 2001 From: Jason Montleon Date: Wed, 24 Jan 2018 09:07:49 -0500 Subject: [PATCH] Bug 1510294 Remove repetitive/false descriptions, set consistent titles --- Dockerfile-canary | 61 +++++++++++++++++++++++----------------------- Dockerfile-latest | 61 +++++++++++++++++++++++----------------------- Dockerfile-nightly | 61 +++++++++++++++++++++++----------------------- apb.yml | 8 +++--- 4 files changed, 94 insertions(+), 97 deletions(-) diff --git a/Dockerfile-canary b/Dockerfile-canary index 7ee766f..bc0fea0 100644 --- a/Dockerfile-canary +++ b/Dockerfile-canary @@ -5,38 +5,37 @@ LABEL "com.redhat.apb.spec"=\ "LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBtYXJp\ YWRiX2RhdGFiYXNlCiAgICBkZWZhdWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICBkZXNj\ cmlwdGlvbjogTWFyaWFEQiBkZWZhdWx0IGRhdGFiYXNlIG5hbWUKICAgIHRpdGxlOiBNYXJpYURC\ -IERhdGFiYXNlIG5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ +IERhdGFiYXNlIE5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ QS1aMC05X10qJCIKICAgIHJlcXVpcmVkOiB0cnVlCiAgLSBuYW1lOiBtYXJpYWRiX3Jvb3RfcGFz\ -c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVt\ -ZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAg\ -cmVxdWlyZWQ6IHRydWUKICAtIG5hbWU6IG1hcmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4K\ -ICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVybjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1th\ -LXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURC\ -IFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVz\ -Y3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVtZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAg\ -cmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFzc3dvcmQKICAtIG5hbWU6IG1hcmlh\ -ZGJfdmVyc2lvbgogICAgZGVmYXVsdDogIjEwLjIiCiAgICBlbnVtOiBbJzEwLjInICwgJzEwLjEn\ -LCAnMTAuMCddCiAgICB0eXBlOiBlbnVtCiAgICB0aXRsZTogTWFyaWFEQiBWZXJzaW9uCiAgICBy\ -ZXF1aXJlZDogdHJ1ZQogICAgdXBkYXRhYmxlOiB0cnVlCgp2ZXJzaW9uOiAxLjAKbmFtZTogbWFy\ -aWFkYi1hcGIKZGVzY3JpcHRpb246IE1hcmlhZGIgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxl\ -OiB0cnVlCmFzeW5jOiBvcHRpb25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIG1hcmlhZGIKbWV0\ -YWRhdGE6CiAgZG9jdW1lbnRhdGlvblVybDogImh0dHBzOi8vbWFyaWFkYi5jb20va2IvZW4vbWFy\ -aWFkYi9kb2N1bWVudGF0aW9uLyIKICBsb25nRGVzY3JpcHRpb246ICJEZXBsb3lzIGEgYmluZGFi\ -bGUgbWFyaWFkYiBpbnN0YW5jZSIKICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nl\ -c3MucmVkaGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMC1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFj\ -Y2Vzcy5yZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAxLXJoZWw3JwogICAgLSAncmVnaXN0cnku\ -YWNjZXNzLnJlZGhhdC5jb20vcmhzY2wvbWFyaWFkYi0xMDItcmhlbDcnCiAgZGlzcGxheU5hbWU6\ -ICJNYXJpYURCIChBUEIpIgogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1t\ -YXJpYWRiCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0g\ -bmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFuIGRlcGxveXMgYSBzaW5nbGUgTWFy\ -aWFEQiBpbnN0YW5jZSB3aXRoIGVwaGVtZXJhbCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBk\ -ZWZhdWx0OiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IERldmVsb3BtZW50\ -CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3BhcmFtcwogICAgdXBkYXRlc190\ -bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFu\ -IGRlcGxveXMgYSBzaW5nbGUgTWFyaWFEQiBpbnN0YW5jZSB3aXRoIDEwIEdpQiBvZiBwZXJzaXN0\ -ZW50IHN0b3JhZ2UKICAgIGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFt\ -ZTogUHJvZHVjdGlvbgogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMK\ -ICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" +c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgcmVx\ +dWlyZWQ6IHRydWUKICAgIHRpdGxlOiBNYXJpYURCIFJvb3QgUGFzc3dvcmQKICAtIG5hbWU6IG1h\ +cmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4KICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVy\ +bjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1thLXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6\ +IHRydWUKICAgIHRpdGxlOiBNYXJpYURCIFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQK\ +ICAgIHR5cGU6IHN0cmluZwogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFz\ +c3dvcmQKICAgIHRpdGxlOiBNYXJpYURCIFBhc3N3b3JkCiAgLSBuYW1lOiBtYXJpYWRiX3ZlcnNp\ +b24KICAgIGRlZmF1bHQ6ICIxMC4yIgogICAgZW51bTogWycxMC4yJyAsICcxMC4xJywgJzEwLjAn\ +XQogICAgdHlwZTogZW51bQogICAgdGl0bGU6IE1hcmlhREIgVmVyc2lvbgogICAgcmVxdWlyZWQ6\ +IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1ZQoKdmVyc2lvbjogMS4wCm5hbWU6IG1hcmlhZGItYXBi\ +CmRlc2NyaXB0aW9uOiBNYXJpYWRiIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQph\ +c3luYzogb3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBtYXJpYWRiCm1ldGFkYXRhOgog\ +IGRvY3VtZW50YXRpb25Vcmw6ICJodHRwczovL21hcmlhZGIuY29tL2tiL2VuL21hcmlhZGIvZG9j\ +dW1lbnRhdGlvbi8iCiAgbG9uZ0Rlc2NyaXB0aW9uOiAiRGVwbG95cyBhIGJpbmRhYmxlIG1hcmlh\ +ZGIgaW5zdGFuY2UiCiAgZGVwZW5kZW5jaWVzOgogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhh\ +dC5jb20vcmhzY2wvbWFyaWFkYi0xMDAtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVk\ +aGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5y\ +ZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAyLXJoZWw3JwogIGRpc3BsYXlOYW1lOiAiTWFyaWFE\ +QiAoQVBCKSIKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tbWFyaWFkYgog\ +IHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRl\ +dgogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lzIGEgc2luZ2xlIE1hcmlhREIgaW5z\ +dGFuY2Ugd2l0aCBlcGhlbWVyYWwgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgZGVmYXVsdDog\ +dHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAogICAgICBj\ +b3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMKICAgIHVwZGF0ZXNfdG86CiAgICAg\ +IC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lz\ +IGEgc2luZ2xlIE1hcmlhREIgaW5zdGFuY2Ugd2l0aCAxMCBHaUIgb2YgcGVyc2lzdGVudCBzdG9y\ +YWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IFByb2R1\ +Y3Rpb24KICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6ICpfcGFyYW1zCiAgICB1cGRh\ +dGVzX3RvOgogICAgICAtIGRldgo=" diff --git a/Dockerfile-latest b/Dockerfile-latest index 8c94c1c..a190644 100644 --- a/Dockerfile-latest +++ b/Dockerfile-latest @@ -5,38 +5,37 @@ LABEL "com.redhat.apb.spec"=\ "LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBtYXJp\ YWRiX2RhdGFiYXNlCiAgICBkZWZhdWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICBkZXNj\ cmlwdGlvbjogTWFyaWFEQiBkZWZhdWx0IGRhdGFiYXNlIG5hbWUKICAgIHRpdGxlOiBNYXJpYURC\ -IERhdGFiYXNlIG5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ +IERhdGFiYXNlIE5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ QS1aMC05X10qJCIKICAgIHJlcXVpcmVkOiB0cnVlCiAgLSBuYW1lOiBtYXJpYWRiX3Jvb3RfcGFz\ -c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVt\ -ZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAg\ -cmVxdWlyZWQ6IHRydWUKICAtIG5hbWU6IG1hcmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4K\ -ICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVybjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1th\ -LXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURC\ -IFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVz\ -Y3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVtZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAg\ -cmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFzc3dvcmQKICAtIG5hbWU6IG1hcmlh\ -ZGJfdmVyc2lvbgogICAgZGVmYXVsdDogIjEwLjIiCiAgICBlbnVtOiBbJzEwLjInICwgJzEwLjEn\ -LCAnMTAuMCddCiAgICB0eXBlOiBlbnVtCiAgICB0aXRsZTogTWFyaWFEQiBWZXJzaW9uCiAgICBy\ -ZXF1aXJlZDogdHJ1ZQogICAgdXBkYXRhYmxlOiB0cnVlCgp2ZXJzaW9uOiAxLjAKbmFtZTogbWFy\ -aWFkYi1hcGIKZGVzY3JpcHRpb246IE1hcmlhZGIgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxl\ -OiB0cnVlCmFzeW5jOiBvcHRpb25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIG1hcmlhZGIKbWV0\ -YWRhdGE6CiAgZG9jdW1lbnRhdGlvblVybDogImh0dHBzOi8vbWFyaWFkYi5jb20va2IvZW4vbWFy\ -aWFkYi9kb2N1bWVudGF0aW9uLyIKICBsb25nRGVzY3JpcHRpb246ICJEZXBsb3lzIGEgYmluZGFi\ -bGUgbWFyaWFkYiBpbnN0YW5jZSIKICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nl\ -c3MucmVkaGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMC1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFj\ -Y2Vzcy5yZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAxLXJoZWw3JwogICAgLSAncmVnaXN0cnku\ -YWNjZXNzLnJlZGhhdC5jb20vcmhzY2wvbWFyaWFkYi0xMDItcmhlbDcnCiAgZGlzcGxheU5hbWU6\ -ICJNYXJpYURCIChBUEIpIgogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1t\ -YXJpYWRiCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0g\ -bmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFuIGRlcGxveXMgYSBzaW5nbGUgTWFy\ -aWFEQiBpbnN0YW5jZSB3aXRoIGVwaGVtZXJhbCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBk\ -ZWZhdWx0OiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IERldmVsb3BtZW50\ -CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3BhcmFtcwogICAgdXBkYXRlc190\ -bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFu\ -IGRlcGxveXMgYSBzaW5nbGUgTWFyaWFEQiBpbnN0YW5jZSB3aXRoIDEwIEdpQiBvZiBwZXJzaXN0\ -ZW50IHN0b3JhZ2UKICAgIGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFt\ -ZTogUHJvZHVjdGlvbgogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMK\ -ICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" +c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgcmVx\ +dWlyZWQ6IHRydWUKICAgIHRpdGxlOiBNYXJpYURCIFJvb3QgUGFzc3dvcmQKICAtIG5hbWU6IG1h\ +cmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4KICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVy\ +bjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1thLXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6\ +IHRydWUKICAgIHRpdGxlOiBNYXJpYURCIFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQK\ +ICAgIHR5cGU6IHN0cmluZwogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFz\ +c3dvcmQKICAgIHRpdGxlOiBNYXJpYURCIFBhc3N3b3JkCiAgLSBuYW1lOiBtYXJpYWRiX3ZlcnNp\ +b24KICAgIGRlZmF1bHQ6ICIxMC4yIgogICAgZW51bTogWycxMC4yJyAsICcxMC4xJywgJzEwLjAn\ +XQogICAgdHlwZTogZW51bQogICAgdGl0bGU6IE1hcmlhREIgVmVyc2lvbgogICAgcmVxdWlyZWQ6\ +IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1ZQoKdmVyc2lvbjogMS4wCm5hbWU6IG1hcmlhZGItYXBi\ +CmRlc2NyaXB0aW9uOiBNYXJpYWRiIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQph\ +c3luYzogb3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBtYXJpYWRiCm1ldGFkYXRhOgog\ +IGRvY3VtZW50YXRpb25Vcmw6ICJodHRwczovL21hcmlhZGIuY29tL2tiL2VuL21hcmlhZGIvZG9j\ +dW1lbnRhdGlvbi8iCiAgbG9uZ0Rlc2NyaXB0aW9uOiAiRGVwbG95cyBhIGJpbmRhYmxlIG1hcmlh\ +ZGIgaW5zdGFuY2UiCiAgZGVwZW5kZW5jaWVzOgogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhh\ +dC5jb20vcmhzY2wvbWFyaWFkYi0xMDAtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVk\ +aGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5y\ +ZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAyLXJoZWw3JwogIGRpc3BsYXlOYW1lOiAiTWFyaWFE\ +QiAoQVBCKSIKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tbWFyaWFkYgog\ +IHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRl\ +dgogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lzIGEgc2luZ2xlIE1hcmlhREIgaW5z\ +dGFuY2Ugd2l0aCBlcGhlbWVyYWwgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgZGVmYXVsdDog\ +dHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAogICAgICBj\ +b3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMKICAgIHVwZGF0ZXNfdG86CiAgICAg\ +IC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lz\ +IGEgc2luZ2xlIE1hcmlhREIgaW5zdGFuY2Ugd2l0aCAxMCBHaUIgb2YgcGVyc2lzdGVudCBzdG9y\ +YWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IFByb2R1\ +Y3Rpb24KICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6ICpfcGFyYW1zCiAgICB1cGRh\ +dGVzX3RvOgogICAgICAtIGRldgo=" diff --git a/Dockerfile-nightly b/Dockerfile-nightly index 1714ebb..319360e 100644 --- a/Dockerfile-nightly +++ b/Dockerfile-nightly @@ -5,38 +5,37 @@ LABEL "com.redhat.apb.spec"=\ "LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBtYXJp\ YWRiX2RhdGFiYXNlCiAgICBkZWZhdWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICBkZXNj\ cmlwdGlvbjogTWFyaWFEQiBkZWZhdWx0IGRhdGFiYXNlIG5hbWUKICAgIHRpdGxlOiBNYXJpYURC\ -IERhdGFiYXNlIG5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ +IERhdGFiYXNlIE5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ QS1aMC05X10qJCIKICAgIHJlcXVpcmVkOiB0cnVlCiAgLSBuYW1lOiBtYXJpYWRiX3Jvb3RfcGFz\ -c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVt\ -ZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAg\ -cmVxdWlyZWQ6IHRydWUKICAtIG5hbWU6IG1hcmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4K\ -ICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVybjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1th\ -LXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURC\ -IFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVz\ -Y3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVtZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAg\ -cmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFzc3dvcmQKICAtIG5hbWU6IG1hcmlh\ -ZGJfdmVyc2lvbgogICAgZGVmYXVsdDogIjEwLjIiCiAgICBlbnVtOiBbJzEwLjInICwgJzEwLjEn\ -LCAnMTAuMCddCiAgICB0eXBlOiBlbnVtCiAgICB0aXRsZTogTWFyaWFEQiBWZXJzaW9uCiAgICBy\ -ZXF1aXJlZDogdHJ1ZQogICAgdXBkYXRhYmxlOiB0cnVlCgp2ZXJzaW9uOiAxLjAKbmFtZTogbWFy\ -aWFkYi1hcGIKZGVzY3JpcHRpb246IE1hcmlhZGIgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxl\ -OiB0cnVlCmFzeW5jOiBvcHRpb25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIG1hcmlhZGIKbWV0\ -YWRhdGE6CiAgZG9jdW1lbnRhdGlvblVybDogImh0dHBzOi8vbWFyaWFkYi5jb20va2IvZW4vbWFy\ -aWFkYi9kb2N1bWVudGF0aW9uLyIKICBsb25nRGVzY3JpcHRpb246ICJEZXBsb3lzIGEgYmluZGFi\ -bGUgbWFyaWFkYiBpbnN0YW5jZSIKICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nl\ -c3MucmVkaGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMC1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFj\ -Y2Vzcy5yZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAxLXJoZWw3JwogICAgLSAncmVnaXN0cnku\ -YWNjZXNzLnJlZGhhdC5jb20vcmhzY2wvbWFyaWFkYi0xMDItcmhlbDcnCiAgZGlzcGxheU5hbWU6\ -ICJNYXJpYURCIChBUEIpIgogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1t\ -YXJpYWRiCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0g\ -bmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFuIGRlcGxveXMgYSBzaW5nbGUgTWFy\ -aWFEQiBpbnN0YW5jZSB3aXRoIGVwaGVtZXJhbCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBk\ -ZWZhdWx0OiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IERldmVsb3BtZW50\ -CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3BhcmFtcwogICAgdXBkYXRlc190\ -bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFu\ -IGRlcGxveXMgYSBzaW5nbGUgTWFyaWFEQiBpbnN0YW5jZSB3aXRoIDEwIEdpQiBvZiBwZXJzaXN0\ -ZW50IHN0b3JhZ2UKICAgIGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFt\ -ZTogUHJvZHVjdGlvbgogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMK\ -ICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" +c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgcmVx\ +dWlyZWQ6IHRydWUKICAgIHRpdGxlOiBNYXJpYURCIFJvb3QgUGFzc3dvcmQKICAtIG5hbWU6IG1h\ +cmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4KICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVy\ +bjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1thLXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6\ +IHRydWUKICAgIHRpdGxlOiBNYXJpYURCIFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQK\ +ICAgIHR5cGU6IHN0cmluZwogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFz\ +c3dvcmQKICAgIHRpdGxlOiBNYXJpYURCIFBhc3N3b3JkCiAgLSBuYW1lOiBtYXJpYWRiX3ZlcnNp\ +b24KICAgIGRlZmF1bHQ6ICIxMC4yIgogICAgZW51bTogWycxMC4yJyAsICcxMC4xJywgJzEwLjAn\ +XQogICAgdHlwZTogZW51bQogICAgdGl0bGU6IE1hcmlhREIgVmVyc2lvbgogICAgcmVxdWlyZWQ6\ +IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1ZQoKdmVyc2lvbjogMS4wCm5hbWU6IG1hcmlhZGItYXBi\ +CmRlc2NyaXB0aW9uOiBNYXJpYWRiIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQph\ +c3luYzogb3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBtYXJpYWRiCm1ldGFkYXRhOgog\ +IGRvY3VtZW50YXRpb25Vcmw6ICJodHRwczovL21hcmlhZGIuY29tL2tiL2VuL21hcmlhZGIvZG9j\ +dW1lbnRhdGlvbi8iCiAgbG9uZ0Rlc2NyaXB0aW9uOiAiRGVwbG95cyBhIGJpbmRhYmxlIG1hcmlh\ +ZGIgaW5zdGFuY2UiCiAgZGVwZW5kZW5jaWVzOgogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhh\ +dC5jb20vcmhzY2wvbWFyaWFkYi0xMDAtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVk\ +aGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5y\ +ZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAyLXJoZWw3JwogIGRpc3BsYXlOYW1lOiAiTWFyaWFE\ +QiAoQVBCKSIKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tbWFyaWFkYgog\ +IHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRl\ +dgogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lzIGEgc2luZ2xlIE1hcmlhREIgaW5z\ +dGFuY2Ugd2l0aCBlcGhlbWVyYWwgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgZGVmYXVsdDog\ +dHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAogICAgICBj\ +b3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMKICAgIHVwZGF0ZXNfdG86CiAgICAg\ +IC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lz\ +IGEgc2luZ2xlIE1hcmlhREIgaW5zdGFuY2Ugd2l0aCAxMCBHaUIgb2YgcGVyc2lzdGVudCBzdG9y\ +YWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IFByb2R1\ +Y3Rpb24KICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6ICpfcGFyYW1zCiAgICB1cGRh\ +dGVzX3RvOgogICAgICAtIGRldgo=" diff --git a/apb.yml b/apb.yml index 308ca1d..e156697 100644 --- a/apb.yml +++ b/apb.yml @@ -5,25 +5,25 @@ _params: &_params default: admin type: string description: MariaDB default database name - title: MariaDB Database name + title: MariaDB Database Name pattern: "^[a-zA-Z0-9_]*[a-zA-Z_]+[a-zA-Z0-9_]*$" required: true - name: mariadb_root_password type: string - description: A random alphanumeric string if left blank display_type: password required: true + title: MariaDB Root Password - name: mariadb_user default: admin type: string pattern: "^[a-zA-Z0-9_]*[a-zA-Z_]+[a-zA-Z0-9_]*$" required: true - description: MariaDB User + title: MariaDB User - name: mariadb_password type: string - description: A random alphanumeric string if left blank required: true display_type: password + title: MariaDB Password - name: mariadb_version default: "10.2" enum: ['10.2' , '10.1', '10.0']