Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Install greenwave from rpm instead of git.

Browse source
This commit is contained in:
Ralph Bean 2017-08-24 03:09:19 +00:00
parent e2bd59f460
commit 2214edf2a4
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/openshift-apps/greenwave/templates/buildconfig.yml
View file

@ -8,7 +8,7 @@ spec:
runPolicy: Serial runPolicy: Serial
source: source:
dockerfile: |- dockerfile: |-
FROM fedora:25 FROM fedora:26
LABEL \ LABEL \
name="Greenwave" \ name="Greenwave" \
vendor="Fedora Infrastructure" \ vendor="Fedora Infrastructure" \
@ -19,16 +19,8 @@ spec:
python-requests \ python-requests \
PyYAML \ PyYAML \
python2-flask 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 \ RUN yum -y install --setopt=tsflags=nodocs \
greenwave https://kojipkgs.fedoraproject.org//packages/greenwave/0.1.1/1.02795e8.fc26/noarch/greenwave-0.1.1-1.02795e8.fc26.noarch.rpm
{% endif %}
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app
strategy: strategy: