From 3d2ef26bc71c461d0c729946a2c2c387436bb107 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 23 Aug 2017 21:01:48 +0000 Subject: Make the greenwave buildconfig a template. --- .../openshift-apps/greenwave/files/buildconfig.yml | 34 ---------------------- .../greenwave/templates/buildconfig.yml | 34 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 roles/openshift-apps/greenwave/files/buildconfig.yml create mode 100644 roles/openshift-apps/greenwave/templates/buildconfig.yml diff --git a/roles/openshift-apps/greenwave/files/buildconfig.yml b/roles/openshift-apps/greenwave/files/buildconfig.yml deleted file mode 100644 index c70d1ec7a..000000000 --- a/roles/openshift-apps/greenwave/files/buildconfig.yml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: BuildConfig -metadata: - name: "greenwave-docker-build" - labels: - environment: "greenwave" -spec: - runPolicy: Serial - source: - dockerfile: |- - FROM fedora:25 - LABEL \ - name="Greenwave" \ - vendor="Fedora Infrastructure" \ - license="MIT" - RUN yum -y install --setopt=tsflags=nodocs \ - git \ - python-gunicorn \ - python-requests \ - PyYAML \ - python2-flask - # 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 - EXPOSE 8080 - ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app - strategy: - type: Docker - output: - to: - kind: ImageStreamTag - name: greenwave:latest diff --git a/roles/openshift-apps/greenwave/templates/buildconfig.yml b/roles/openshift-apps/greenwave/templates/buildconfig.yml new file mode 100644 index 000000000..c70d1ec7a --- /dev/null +++ b/roles/openshift-apps/greenwave/templates/buildconfig.yml @@ -0,0 +1,34 @@ +apiVersion: v1 +kind: BuildConfig +metadata: + name: "greenwave-docker-build" + labels: + environment: "greenwave" +spec: + runPolicy: Serial + source: + dockerfile: |- + FROM fedora:25 + LABEL \ + name="Greenwave" \ + vendor="Fedora Infrastructure" \ + license="MIT" + RUN yum -y install --setopt=tsflags=nodocs \ + git \ + python-gunicorn \ + python-requests \ + PyYAML \ + python2-flask + # 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 + EXPOSE 8080 + ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app + strategy: + type: Docker + output: + to: + kind: ImageStreamTag + name: greenwave:latest -- cgit