From 6dc364875f5ec15534d88c6a9592f06e55774dc5 Mon Sep 17 00:00:00 2001 From: David Zager Date: Thu, 2 Aug 2018 13:32:30 -0400 Subject: [PATCH] Bug 1610987: Update default registry for app image --- Dockerfile-canary | 94 ++++++++++++++++++++-------------------- Dockerfile-latest | 94 ++++++++++++++++++++-------------------- Dockerfile-nightly | 94 ++++++++++++++++++++-------------------- apb.yml | 6 +-- defaults/main.yml | 5 ++- downstream.patch | 33 ++++++++++++++ postgresql-apb-role.spec | 3 ++ 7 files changed, 184 insertions(+), 145 deletions(-) create mode 100644 downstream.patch diff --git a/Dockerfile-canary b/Dockerfile-canary index 52f2dcf..091515a 100644 --- a/Dockerfile-canary +++ b/Dockerfile-canary @@ -7,53 +7,53 @@ IFBvc3RncmVTUUwgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxlOiB0cnVlCmFzeW5jOiBvcHRp\ b25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIHBvc3RncmVzcWwKbWV0YWRhdGE6CiAgZG9jdW1l\ bnRhdGlvblVybDogaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5vcmcvZG9jcy8KICBsb25nRGVzY3Jp\ cHRpb246IEFuIGFwYiB0aGF0IGRlcGxveXMgcG9zdGdyZXNxbCA5LjQsIDkuNSwgb3IgOS42Lgog\ -IGRlcGVuZGVuY2llczoKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQuY29tL3Joc2NsL3Bv\ -c3RncmVzcWwtOTQtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVkaGF0LmNvbS9yaHNj\ -bC9wb3N0Z3Jlc3FsLTk1LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhhdC5jb20v\ -cmhzY2wvcG9zdGdyZXNxbC05Ni1yaGVsNycKICBkaXNwbGF5TmFtZTogUG9zdGdyZVNRTCAoQVBC\ -KQogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1wb3N0Z3Jlc3FsCiAgcHJv\ -dmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0gbmFtZTogZGV2CiAg\ -ICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggbm8gc3RvcmFnZQogICAgZnJl\ -ZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAogICAg\ -ICBsb25nRGVzY3JpcHRpb246CiAgICAgICAgVGhpcyBwbGFuIHByb3ZpZGVzIGEgc2luZ2xlIG5v\ -bi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRob3V0CiAgICAgICAgcGVyc2lzdGVudCBzdG9yYWdl\ -CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOgogICAgICAtIG5hbWU6IHBvc3RncmVz\ -cWxfZGF0YWJhc2UKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAgIHR5cGU6IHN0cmluZwog\ -ICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIERhdGFiYXNlIE5hbWUKICAgICAgICBwYXR0ZXJuOiAi\ -XlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0g\ -bmFtZTogcG9zdGdyZXNxbF91c2VyCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0aXRs\ -ZTogUG9zdGdyZVNRTCBVc2VyCiAgICAgICAgdHlwZTogc3RyaW5nCiAgICAgICAgbWF4bGVuZ3Ro\ -OiA2MwogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWl9dW2EtekEtWjAtOV9dKiQiCiAgICAgICAg\ -cmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3Bhc3N3b3JkCiAgICAgICAg\ -dHlwZTogc3RyaW5nCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgUGFzc3dvcmQKICAgICAgICBk\ -aXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICAgICAgcGF0dGVybjogIl5bYS16QS1aMC05X34hQCMk\ -JV4mKigpLT08PiwuPzs6fF0rJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAtIG5hbWU6\ -IHBvc3RncmVzcWxfdmVyc2lvbgogICAgICAgIGRlZmF1bHQ6ICc5LjYnCiAgICAgICAgZW51bTog\ -Wyc5LjYnLCAnOS41JywgJzkuNCddCiAgICAgICAgdHlwZTogZW51bQogICAgICAgIHRpdGxlOiBQ\ -b3N0Z3JlU1FMIFZlcnNpb24KICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAgIHVwZGF0YWJs\ -ZTogdHJ1ZQogICAgdXBkYXRlc190bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBk\ -ZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggcGVyc2lzdGVudCBzdG9yYWdlCiAg\ -ICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IFByb2R1Y3Rpb24K\ -ICAgICAgbG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBwcm92aWRlcyBhIHNpbmds\ -ZSBub24tSEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aAogICAgICAgIHBlcnNpc3RlbnQgc3RvcmFn\ -ZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAgLSBuYW1lOiBwb3N0Z3Jl\ -c3FsX2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0eXBlOiBzdHJpbmcK\ -ICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAgICAgICAgcGF0dGVybjog\ -Il5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAt\ -IG5hbWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdGl0\ -bGU6IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIG1heGxlbmd0\ -aDogNjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAg\ -IHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9wYXNzd29yZAogICAgICAg\ -IHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBhc3N3b3JkCiAgICAgICAg\ -ZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9+IUAj\ -JCVeJiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1l\ -OiBwb3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42JwogICAgICAgIGVudW06\ -IFsnOS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0KICAgICAgICB0aXRsZTog\ -UG9zdGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgICB1cGRhdGFi\ -bGU6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZvbHVtZV9zaXplCiAgICAgICAgdHlw\ -ZTogZW51bQogICAgICAgIGRlZmF1bHQ6ICcxR2knCiAgICAgICAgZW51bTogWycxR2knLCAnNUdp\ -JywgJzEwR2knXQogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZvbHVtZSBTaXplCiAgICAgICAg\ -cmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" +IGRlcGVuZGVuY2llczoKICAgIC0gJ2RvY2tlci5pby9jZW50b3MvcG9zdGdyZXNxbC05NC1jZW50\ +b3M3JwogICAgLSAnZG9ja2VyLmlvL2NlbnRvcy9wb3N0Z3Jlc3FsLTk1LWNlbnRvczcnCiAgICAt\ +ICdkb2NrZXIuaW8vY2VudG9zL3Bvc3RncmVzcWwtOTYtY2VudG9zNycKICBkaXNwbGF5TmFtZTog\ +UG9zdGdyZVNRTCAoQVBCKQogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1w\ +b3N0Z3Jlc3FsCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgog\ +IC0gbmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggbm8g\ +c3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBE\ +ZXZlbG9wbWVudAogICAgICBsb25nRGVzY3JpcHRpb246CiAgICAgICAgVGhpcyBwbGFuIHByb3Zp\ +ZGVzIGEgc2luZ2xlIG5vbi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRob3V0CiAgICAgICAgcGVy\ +c2lzdGVudCBzdG9yYWdlCiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOgogICAgICAt\ +IG5hbWU6IHBvc3RncmVzcWxfZGF0YWJhc2UKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAg\ +IHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIERhdGFiYXNlIE5hbWUKICAg\ +ICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJlcXVpcmVk\ +OiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF91c2VyCiAgICAgICAgZGVmYXVsdDogYWRt\ +aW4KICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBVc2VyCiAgICAgICAgdHlwZTogc3RyaW5nCiAg\ +ICAgICAgbWF4bGVuZ3RoOiA2MwogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWl9dW2EtekEtWjAt\ +OV9dKiQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3Bh\ +c3N3b3JkCiAgICAgICAgdHlwZTogc3RyaW5nCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgUGFz\ +c3dvcmQKICAgICAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICAgICAgcGF0dGVybjogIl5b\ +YS16QS1aMC05X34hQCMkJV4mKigpLT08PiwuPzs6fF0rJCIKICAgICAgICByZXF1aXJlZDogdHJ1\ +ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfdmVyc2lvbgogICAgICAgIGRlZmF1bHQ6ICc5LjYn\ +CiAgICAgICAgZW51bTogWyc5LjYnLCAnOS41JywgJzkuNCddCiAgICAgICAgdHlwZTogZW51bQog\ +ICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZlcnNpb24KICAgICAgICByZXF1aXJlZDogdHJ1ZQog\ +ICAgICAgIHVwZGF0YWJsZTogdHJ1ZQogICAgdXBkYXRlc190bzoKICAgICAgLSBwcm9kCiAgLSBu\ +YW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggcGVyc2lz\ +dGVudCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5h\ +bWU6IFByb2R1Y3Rpb24KICAgICAgbG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBw\ +cm92aWRlcyBhIHNpbmdsZSBub24tSEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aAogICAgICAgIHBl\ +cnNpc3RlbnQgc3RvcmFnZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAg\ +LSBuYW1lOiBwb3N0Z3Jlc3FsX2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAg\ +ICB0eXBlOiBzdHJpbmcKICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAg\ +ICAgICAgcGF0dGVybjogIl5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJl\ +ZDogdHJ1ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFk\ +bWluCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwog\ +ICAgICAgIG1heGxlbmd0aDogNjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVow\ +LTlfXSokIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9w\ +YXNzd29yZAogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBh\ +c3N3b3JkCiAgICAgICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJe\ +W2EtekEtWjAtOV9+IUAjJCVeJiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRy\ +dWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42\ +JwogICAgICAgIGVudW06IFsnOS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0K\ +ICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUK\ +ICAgICAgICB1cGRhdGFibGU6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZvbHVtZV9z\ +aXplCiAgICAgICAgdHlwZTogZW51bQogICAgICAgIGRlZmF1bHQ6ICcxR2knCiAgICAgICAgZW51\ +bTogWycxR2knLCAnNUdpJywgJzEwR2knXQogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZvbHVt\ +ZSBTaXplCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2\ +Cg==" ADD playbooks /opt/apb/actions diff --git a/Dockerfile-latest b/Dockerfile-latest index e978903..2a94e85 100644 --- a/Dockerfile-latest +++ b/Dockerfile-latest @@ -7,53 +7,53 @@ IFBvc3RncmVTUUwgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxlOiB0cnVlCmFzeW5jOiBvcHRp\ b25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIHBvc3RncmVzcWwKbWV0YWRhdGE6CiAgZG9jdW1l\ bnRhdGlvblVybDogaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5vcmcvZG9jcy8KICBsb25nRGVzY3Jp\ cHRpb246IEFuIGFwYiB0aGF0IGRlcGxveXMgcG9zdGdyZXNxbCA5LjQsIDkuNSwgb3IgOS42Lgog\ -IGRlcGVuZGVuY2llczoKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQuY29tL3Joc2NsL3Bv\ -c3RncmVzcWwtOTQtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVkaGF0LmNvbS9yaHNj\ -bC9wb3N0Z3Jlc3FsLTk1LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhhdC5jb20v\ -cmhzY2wvcG9zdGdyZXNxbC05Ni1yaGVsNycKICBkaXNwbGF5TmFtZTogUG9zdGdyZVNRTCAoQVBC\ -KQogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1wb3N0Z3Jlc3FsCiAgcHJv\ -dmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0gbmFtZTogZGV2CiAg\ -ICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggbm8gc3RvcmFnZQogICAgZnJl\ -ZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAogICAg\ -ICBsb25nRGVzY3JpcHRpb246CiAgICAgICAgVGhpcyBwbGFuIHByb3ZpZGVzIGEgc2luZ2xlIG5v\ -bi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRob3V0CiAgICAgICAgcGVyc2lzdGVudCBzdG9yYWdl\ -CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOgogICAgICAtIG5hbWU6IHBvc3RncmVz\ -cWxfZGF0YWJhc2UKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAgIHR5cGU6IHN0cmluZwog\ -ICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIERhdGFiYXNlIE5hbWUKICAgICAgICBwYXR0ZXJuOiAi\ -XlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0g\ -bmFtZTogcG9zdGdyZXNxbF91c2VyCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0aXRs\ -ZTogUG9zdGdyZVNRTCBVc2VyCiAgICAgICAgdHlwZTogc3RyaW5nCiAgICAgICAgbWF4bGVuZ3Ro\ -OiA2MwogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWl9dW2EtekEtWjAtOV9dKiQiCiAgICAgICAg\ -cmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3Bhc3N3b3JkCiAgICAgICAg\ -dHlwZTogc3RyaW5nCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgUGFzc3dvcmQKICAgICAgICBk\ -aXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICAgICAgcGF0dGVybjogIl5bYS16QS1aMC05X34hQCMk\ -JV4mKigpLT08PiwuPzs6fF0rJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAtIG5hbWU6\ -IHBvc3RncmVzcWxfdmVyc2lvbgogICAgICAgIGRlZmF1bHQ6ICc5LjYnCiAgICAgICAgZW51bTog\ -Wyc5LjYnLCAnOS41JywgJzkuNCddCiAgICAgICAgdHlwZTogZW51bQogICAgICAgIHRpdGxlOiBQ\ -b3N0Z3JlU1FMIFZlcnNpb24KICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAgIHVwZGF0YWJs\ -ZTogdHJ1ZQogICAgdXBkYXRlc190bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBk\ -ZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggcGVyc2lzdGVudCBzdG9yYWdlCiAg\ -ICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IFByb2R1Y3Rpb24K\ -ICAgICAgbG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBwcm92aWRlcyBhIHNpbmds\ -ZSBub24tSEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aAogICAgICAgIHBlcnNpc3RlbnQgc3RvcmFn\ -ZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAgLSBuYW1lOiBwb3N0Z3Jl\ -c3FsX2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0eXBlOiBzdHJpbmcK\ -ICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAgICAgICAgcGF0dGVybjog\ -Il5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAt\ -IG5hbWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdGl0\ -bGU6IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIG1heGxlbmd0\ -aDogNjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAg\ -IHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9wYXNzd29yZAogICAgICAg\ -IHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBhc3N3b3JkCiAgICAgICAg\ -ZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9+IUAj\ -JCVeJiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1l\ -OiBwb3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42JwogICAgICAgIGVudW06\ -IFsnOS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0KICAgICAgICB0aXRsZTog\ -UG9zdGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgICB1cGRhdGFi\ -bGU6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZvbHVtZV9zaXplCiAgICAgICAgdHlw\ -ZTogZW51bQogICAgICAgIGRlZmF1bHQ6ICcxR2knCiAgICAgICAgZW51bTogWycxR2knLCAnNUdp\ -JywgJzEwR2knXQogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZvbHVtZSBTaXplCiAgICAgICAg\ -cmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" +IGRlcGVuZGVuY2llczoKICAgIC0gJ2RvY2tlci5pby9jZW50b3MvcG9zdGdyZXNxbC05NC1jZW50\ +b3M3JwogICAgLSAnZG9ja2VyLmlvL2NlbnRvcy9wb3N0Z3Jlc3FsLTk1LWNlbnRvczcnCiAgICAt\ +ICdkb2NrZXIuaW8vY2VudG9zL3Bvc3RncmVzcWwtOTYtY2VudG9zNycKICBkaXNwbGF5TmFtZTog\ +UG9zdGdyZVNRTCAoQVBCKQogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1w\ +b3N0Z3Jlc3FsCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgog\ +IC0gbmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggbm8g\ +c3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBE\ +ZXZlbG9wbWVudAogICAgICBsb25nRGVzY3JpcHRpb246CiAgICAgICAgVGhpcyBwbGFuIHByb3Zp\ +ZGVzIGEgc2luZ2xlIG5vbi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRob3V0CiAgICAgICAgcGVy\ +c2lzdGVudCBzdG9yYWdlCiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOgogICAgICAt\ +IG5hbWU6IHBvc3RncmVzcWxfZGF0YWJhc2UKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAg\ +IHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIERhdGFiYXNlIE5hbWUKICAg\ +ICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJlcXVpcmVk\ +OiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF91c2VyCiAgICAgICAgZGVmYXVsdDogYWRt\ +aW4KICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBVc2VyCiAgICAgICAgdHlwZTogc3RyaW5nCiAg\ +ICAgICAgbWF4bGVuZ3RoOiA2MwogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWl9dW2EtekEtWjAt\ +OV9dKiQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3Bh\ +c3N3b3JkCiAgICAgICAgdHlwZTogc3RyaW5nCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgUGFz\ +c3dvcmQKICAgICAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICAgICAgcGF0dGVybjogIl5b\ +YS16QS1aMC05X34hQCMkJV4mKigpLT08PiwuPzs6fF0rJCIKICAgICAgICByZXF1aXJlZDogdHJ1\ +ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfdmVyc2lvbgogICAgICAgIGRlZmF1bHQ6ICc5LjYn\ +CiAgICAgICAgZW51bTogWyc5LjYnLCAnOS41JywgJzkuNCddCiAgICAgICAgdHlwZTogZW51bQog\ +ICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZlcnNpb24KICAgICAgICByZXF1aXJlZDogdHJ1ZQog\ +ICAgICAgIHVwZGF0YWJsZTogdHJ1ZQogICAgdXBkYXRlc190bzoKICAgICAgLSBwcm9kCiAgLSBu\ +YW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggcGVyc2lz\ +dGVudCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5h\ +bWU6IFByb2R1Y3Rpb24KICAgICAgbG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBw\ +cm92aWRlcyBhIHNpbmdsZSBub24tSEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aAogICAgICAgIHBl\ +cnNpc3RlbnQgc3RvcmFnZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAg\ +LSBuYW1lOiBwb3N0Z3Jlc3FsX2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAg\ +ICB0eXBlOiBzdHJpbmcKICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAg\ +ICAgICAgcGF0dGVybjogIl5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJl\ +ZDogdHJ1ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFk\ +bWluCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwog\ +ICAgICAgIG1heGxlbmd0aDogNjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVow\ +LTlfXSokIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9w\ +YXNzd29yZAogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBh\ +c3N3b3JkCiAgICAgICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJe\ +W2EtekEtWjAtOV9+IUAjJCVeJiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRy\ +dWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42\ +JwogICAgICAgIGVudW06IFsnOS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0K\ +ICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUK\ +ICAgICAgICB1cGRhdGFibGU6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZvbHVtZV9z\ +aXplCiAgICAgICAgdHlwZTogZW51bQogICAgICAgIGRlZmF1bHQ6ICcxR2knCiAgICAgICAgZW51\ +bTogWycxR2knLCAnNUdpJywgJzEwR2knXQogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZvbHVt\ +ZSBTaXplCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2\ +Cg==" RUN yum -y install postgresql-apb-role && yum clean all diff --git a/Dockerfile-nightly b/Dockerfile-nightly index 800f26b..7ccf36c 100644 --- a/Dockerfile-nightly +++ b/Dockerfile-nightly @@ -7,53 +7,53 @@ IFBvc3RncmVTUUwgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxlOiB0cnVlCmFzeW5jOiBvcHRp\ b25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIHBvc3RncmVzcWwKbWV0YWRhdGE6CiAgZG9jdW1l\ bnRhdGlvblVybDogaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5vcmcvZG9jcy8KICBsb25nRGVzY3Jp\ cHRpb246IEFuIGFwYiB0aGF0IGRlcGxveXMgcG9zdGdyZXNxbCA5LjQsIDkuNSwgb3IgOS42Lgog\ -IGRlcGVuZGVuY2llczoKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQuY29tL3Joc2NsL3Bv\ -c3RncmVzcWwtOTQtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVkaGF0LmNvbS9yaHNj\ -bC9wb3N0Z3Jlc3FsLTk1LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhhdC5jb20v\ -cmhzY2wvcG9zdGdyZXNxbC05Ni1yaGVsNycKICBkaXNwbGF5TmFtZTogUG9zdGdyZVNRTCAoQVBC\ -KQogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1wb3N0Z3Jlc3FsCiAgcHJv\ -dmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0gbmFtZTogZGV2CiAg\ -ICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggbm8gc3RvcmFnZQogICAgZnJl\ -ZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAogICAg\ -ICBsb25nRGVzY3JpcHRpb246CiAgICAgICAgVGhpcyBwbGFuIHByb3ZpZGVzIGEgc2luZ2xlIG5v\ -bi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRob3V0CiAgICAgICAgcGVyc2lzdGVudCBzdG9yYWdl\ -CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOgogICAgICAtIG5hbWU6IHBvc3RncmVz\ -cWxfZGF0YWJhc2UKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAgIHR5cGU6IHN0cmluZwog\ -ICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIERhdGFiYXNlIE5hbWUKICAgICAgICBwYXR0ZXJuOiAi\ -XlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0g\ -bmFtZTogcG9zdGdyZXNxbF91c2VyCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0aXRs\ -ZTogUG9zdGdyZVNRTCBVc2VyCiAgICAgICAgdHlwZTogc3RyaW5nCiAgICAgICAgbWF4bGVuZ3Ro\ -OiA2MwogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWl9dW2EtekEtWjAtOV9dKiQiCiAgICAgICAg\ -cmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3Bhc3N3b3JkCiAgICAgICAg\ -dHlwZTogc3RyaW5nCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgUGFzc3dvcmQKICAgICAgICBk\ -aXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICAgICAgcGF0dGVybjogIl5bYS16QS1aMC05X34hQCMk\ -JV4mKigpLT08PiwuPzs6fF0rJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAtIG5hbWU6\ -IHBvc3RncmVzcWxfdmVyc2lvbgogICAgICAgIGRlZmF1bHQ6ICc5LjYnCiAgICAgICAgZW51bTog\ -Wyc5LjYnLCAnOS41JywgJzkuNCddCiAgICAgICAgdHlwZTogZW51bQogICAgICAgIHRpdGxlOiBQ\ -b3N0Z3JlU1FMIFZlcnNpb24KICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAgIHVwZGF0YWJs\ -ZTogdHJ1ZQogICAgdXBkYXRlc190bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBk\ -ZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggcGVyc2lzdGVudCBzdG9yYWdlCiAg\ -ICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IFByb2R1Y3Rpb24K\ -ICAgICAgbG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBwcm92aWRlcyBhIHNpbmds\ -ZSBub24tSEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aAogICAgICAgIHBlcnNpc3RlbnQgc3RvcmFn\ -ZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAgLSBuYW1lOiBwb3N0Z3Jl\ -c3FsX2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0eXBlOiBzdHJpbmcK\ -ICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAgICAgICAgcGF0dGVybjog\ -Il5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAt\ -IG5hbWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdGl0\ -bGU6IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIG1heGxlbmd0\ -aDogNjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAg\ -IHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9wYXNzd29yZAogICAgICAg\ -IHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBhc3N3b3JkCiAgICAgICAg\ -ZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9+IUAj\ -JCVeJiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1l\ -OiBwb3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42JwogICAgICAgIGVudW06\ -IFsnOS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0KICAgICAgICB0aXRsZTog\ -UG9zdGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgICB1cGRhdGFi\ -bGU6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZvbHVtZV9zaXplCiAgICAgICAgdHlw\ -ZTogZW51bQogICAgICAgIGRlZmF1bHQ6ICcxR2knCiAgICAgICAgZW51bTogWycxR2knLCAnNUdp\ -JywgJzEwR2knXQogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZvbHVtZSBTaXplCiAgICAgICAg\ -cmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" +IGRlcGVuZGVuY2llczoKICAgIC0gJ2RvY2tlci5pby9jZW50b3MvcG9zdGdyZXNxbC05NC1jZW50\ +b3M3JwogICAgLSAnZG9ja2VyLmlvL2NlbnRvcy9wb3N0Z3Jlc3FsLTk1LWNlbnRvczcnCiAgICAt\ +ICdkb2NrZXIuaW8vY2VudG9zL3Bvc3RncmVzcWwtOTYtY2VudG9zNycKICBkaXNwbGF5TmFtZTog\ +UG9zdGdyZVNRTCAoQVBCKQogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1w\ +b3N0Z3Jlc3FsCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgog\ +IC0gbmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggbm8g\ +c3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBE\ +ZXZlbG9wbWVudAogICAgICBsb25nRGVzY3JpcHRpb246CiAgICAgICAgVGhpcyBwbGFuIHByb3Zp\ +ZGVzIGEgc2luZ2xlIG5vbi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRob3V0CiAgICAgICAgcGVy\ +c2lzdGVudCBzdG9yYWdlCiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOgogICAgICAt\ +IG5hbWU6IHBvc3RncmVzcWxfZGF0YWJhc2UKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAg\ +IHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIERhdGFiYXNlIE5hbWUKICAg\ +ICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJlcXVpcmVk\ +OiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF91c2VyCiAgICAgICAgZGVmYXVsdDogYWRt\ +aW4KICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBVc2VyCiAgICAgICAgdHlwZTogc3RyaW5nCiAg\ +ICAgICAgbWF4bGVuZ3RoOiA2MwogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWl9dW2EtekEtWjAt\ +OV9dKiQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3Bh\ +c3N3b3JkCiAgICAgICAgdHlwZTogc3RyaW5nCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgUGFz\ +c3dvcmQKICAgICAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICAgICAgcGF0dGVybjogIl5b\ +YS16QS1aMC05X34hQCMkJV4mKigpLT08PiwuPzs6fF0rJCIKICAgICAgICByZXF1aXJlZDogdHJ1\ +ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfdmVyc2lvbgogICAgICAgIGRlZmF1bHQ6ICc5LjYn\ +CiAgICAgICAgZW51bTogWyc5LjYnLCAnOS41JywgJzkuNCddCiAgICAgICAgdHlwZTogZW51bQog\ +ICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZlcnNpb24KICAgICAgICByZXF1aXJlZDogdHJ1ZQog\ +ICAgICAgIHVwZGF0YWJsZTogdHJ1ZQogICAgdXBkYXRlc190bzoKICAgICAgLSBwcm9kCiAgLSBu\ +YW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogQSBzaW5nbGUgREIgc2VydmVyIHdpdGggcGVyc2lz\ +dGVudCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5h\ +bWU6IFByb2R1Y3Rpb24KICAgICAgbG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBw\ +cm92aWRlcyBhIHNpbmdsZSBub24tSEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aAogICAgICAgIHBl\ +cnNpc3RlbnQgc3RvcmFnZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAg\ +LSBuYW1lOiBwb3N0Z3Jlc3FsX2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAg\ +ICB0eXBlOiBzdHJpbmcKICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAg\ +ICAgICAgcGF0dGVybjogIl5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJl\ +ZDogdHJ1ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFk\ +bWluCiAgICAgICAgdGl0bGU6IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwog\ +ICAgICAgIG1heGxlbmd0aDogNjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVow\ +LTlfXSokIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9w\ +YXNzd29yZAogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBh\ +c3N3b3JkCiAgICAgICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJe\ +W2EtekEtWjAtOV9+IUAjJCVeJiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRy\ +dWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42\ +JwogICAgICAgIGVudW06IFsnOS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0K\ +ICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUK\ +ICAgICAgICB1cGRhdGFibGU6IHRydWUKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3ZvbHVtZV9z\ +aXplCiAgICAgICAgdHlwZTogZW51bQogICAgICAgIGRlZmF1bHQ6ICcxR2knCiAgICAgICAgZW51\ +bTogWycxR2knLCAnNUdpJywgJzEwR2knXQogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFZvbHVt\ +ZSBTaXplCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2\ +Cg==" RUN yum -y install postgresql-apb-role && yum clean all diff --git a/apb.yml b/apb.yml index d0bf41e..ccf7247 100644 --- a/apb.yml +++ b/apb.yml @@ -12,9 +12,9 @@ metadata: documentationUrl: https://www.postgresql.org/docs/ longDescription: An apb that deploys postgresql 9.4, 9.5, or 9.6. dependencies: - - 'registry.access.redhat.com/rhscl/postgresql-94-rhel7' - - 'registry.access.redhat.com/rhscl/postgresql-95-rhel7' - - 'registry.access.redhat.com/rhscl/postgresql-96-rhel7' + - 'docker.io/centos/postgresql-94-centos7' + - 'docker.io/centos/postgresql-95-centos7' + - 'docker.io/centos/postgresql-96-centos7' displayName: PostgreSQL (APB) console.openshift.io/iconClass: icon-postgresql providerDisplayName: "Red Hat, Inc." diff --git a/defaults/main.yml b/defaults/main.yml index 0264ff3..ab246d1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,7 +6,10 @@ _apb_service_class_id: 0 _apb_service_instance_id: 0 app_name: "postgresql-{{ _apb_service_instance_id }}" -app_image: registry.access.redhat.com/rhscl/postgresql-{{ postgresql_version | replace('.', '') }}-rhel7 +registry_url: docker.io +registry_org: centos +image_version: centos7 +app_image: "{{ registry_url }}/{{ registry_org }}/postgresql-{{ postgresql_version | replace('.', '') }}-{{ image_version }}" namespace: "{{ lookup('env','NAMESPACE') | default('postgresql', true) }}" # Postgresql defaults diff --git a/downstream.patch b/downstream.patch new file mode 100644 index 0000000..c0f66f4 --- /dev/null +++ b/downstream.patch @@ -0,0 +1,33 @@ +diff --git a/apb.yml b/apb.yml +index ccf7247..93f0377 100644 +--- a/apb.yml ++++ b/apb.yml +@@ -12,9 +12,9 @@ metadata: + documentationUrl: https://www.postgresql.org/docs/ + longDescription: An apb that deploys postgresql 9.4, 9.5, or 9.6. + dependencies: +- - 'docker.io/centos/postgresql-94-centos7' +- - 'docker.io/centos/postgresql-95-centos7' +- - 'docker.io/centos/postgresql-96-centos7' ++ - 'registry.redhat.io/rhscl/postgresql-94-rhel7' ++ - 'registry.redhat.io/rhscl/postgresql-95-rhel7' ++ - 'registry.redhat.io/rhscl/postgresql-96-rhel7' + displayName: PostgreSQL (APB) + console.openshift.io/iconClass: icon-postgresql + providerDisplayName: "Red Hat, Inc." +diff --git a/defaults/main.yml b/defaults/main.yml +index ab246d1..e82e581 100644 +--- a/defaults/main.yml ++++ b/defaults/main.yml +@@ -6,9 +6,9 @@ _apb_service_class_id: 0 + _apb_service_instance_id: 0 + + app_name: "postgresql-{{ _apb_service_instance_id }}" +-registry_url: docker.io +-registry_org: centos +-image_version: centos7 ++registry_url: registry.redhat.io ++registry_org: rhscl ++image_version: rhel7 + app_image: "{{ registry_url }}/{{ registry_org }}/postgresql-{{ postgresql_version | replace('.', '') }}-{{ image_version }}" + namespace: "{{ lookup('env','NAMESPACE') | default('postgresql', true) }}" diff --git a/postgresql-apb-role.spec b/postgresql-apb-role.spec index 14f1fb5..4994987 100644 --- a/postgresql-apb-role.spec +++ b/postgresql-apb-role.spec @@ -19,6 +19,9 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version} +%if !0%{?copr} +patch -p1 < downstream.patch +%endif %install mkdir -p %{buildroot}/opt/apb/ %{buildroot}/opt/ansible/roles/postgresql-apb