From 2214edf2a4545daf4c1169c8f80b132b3bd0b186 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 24 Aug 2017 03:09:19 +0000 Subject: [PATCH] Install greenwave from rpm instead of git. --- .../greenwave/templates/buildconfig.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/roles/openshift-apps/greenwave/templates/buildconfig.yml b/roles/openshift-apps/greenwave/templates/buildconfig.yml index 0e2dee2949..694fbb6d28 100644 --- a/roles/openshift-apps/greenwave/templates/buildconfig.yml +++ b/roles/openshift-apps/greenwave/templates/buildconfig.yml @@ -8,7 +8,7 @@ spec: runPolicy: Serial source: dockerfile: |- - FROM fedora:25 + FROM fedora:26 LABEL \ name="Greenwave" \ vendor="Fedora Infrastructure" \ @@ -19,16 +19,8 @@ spec: python-requests \ PyYAML \ python2-flask - {% if env == 'staging' %} - # https://pagure.io/greenwave/pull-request/62 - # https://pagure.io/greenwave/pull-request/63 - RUN git clone -b special-relevance https://pagure.io/greenwave.git /srv/greenwave - RUN ln -s /etc/greenwave/settings.py /srv/greenwave/conf/settings.py - WORKDIR /srv/greenwave - {% else %} RUN yum -y install --setopt=tsflags=nodocs \ - greenwave - {% endif %} + https://kojipkgs.fedoraproject.org//packages/greenwave/0.1.1/1.02795e8.fc26/noarch/greenwave-0.1.1-1.02795e8.fc26.noarch.rpm EXPOSE 8080 ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app strategy: