From 96f19cbee62b0ae019a1fd0860f90d6ec5f68688 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 10 May 2018 16:16:08 +0000 Subject: [PATCH] Revert "Remove my greenwave-staging experiment to get out of lholecek and giulia's way." This reverts commit 31c73053134218124d0614f802407da68e8ea0ef. --- .../greenwave/templates/buildconfig.yml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/roles/openshift-apps/greenwave/templates/buildconfig.yml b/roles/openshift-apps/greenwave/templates/buildconfig.yml index 204a3f7fd4..2cccd555f3 100644 --- a/roles/openshift-apps/greenwave/templates/buildconfig.yml +++ b/roles/openshift-apps/greenwave/templates/buildconfig.yml @@ -4,6 +4,46 @@ metadata: name: "greenwave-docker-build" labels: environment: "greenwave" +{% if env == 'staging' %} +spec: + runPolicy: Serial + source: + dockerfile: |- + # See imagestream.yml for the definition + FROM greenwave-upstream:latest + + # fedmsg needs a username. + ENV USER=greenwave + + # Become root during build to chmod + USER 0 + + # create a symlink for configuring the fedmsg consumers. + RUN ln -sfn /etc/fedmsg-greenwave.d/greenwave.py /etc/fedmsg.d/zz_greenwave.py + + # And another two for putting the certs in place. + RUN mkdir -p /etc/pki/fedmsg/ + RUN ln -sf /etc/pki/fedmsg/key/fedmsg-greenwave.key /etc/pki/fedmsg/greenwave.key + RUN ln -sf /etc/pki/fedmsg/crt/fedmsg-greenwave.crt /etc/pki/fedmsg/greenwave.crt + + # Make sure fedmsg can write its CRL. + RUN chmod 777 /var/run/fedmsg/ + + # Become non-root again + USER 1001 + strategy: + type: Docker + dockerStrategy: + from: + kind: "ImageStreamTag" + name: "greenwave-upstream:latest" + triggers: + - type: ImageChange + output: + to: + kind: ImageStreamTag + name: greenwave:latest +{% else %} spec: runPolicy: Serial source: @@ -47,3 +87,4 @@ spec: to: kind: ImageStreamTag name: greenwave:latest +{% endif %}