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

Reverting bodhi-openshift to use openshift-build instead of quay

Browse source
This commit is contained in:
Adam Saleh 2020-02-20 14:50:24 +01:00 • committed by Pierre-Yves Chibon
parent f84a1ea988
commit d47e1f29e8
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
roles/openshift-apps/bodhi/templates/deploymentconfig.yml
View file

@ -58,7 +58,7 @@ items:
containers:
- name: bodhi-web
{% if env == "staging" %}
image: bodhi-base-prebuilt:staging
image: bodhi-base:latest
command: ["bash"]
args: ["/etc/bodhi/start.sh"]
{% else %}
@ -133,7 +133,7 @@ items:
from:
kind: ImageStreamTag
{% if env == "staging" %}
name: bodhi-base-prebuilt:staging
name: bodhi-base:latest
{% else %}
name: bodhi-web:latest
{% endif %}
@ -182,7 +182,7 @@ items:
containers:
- name: bodhi-consumer
{% if env == "staging" %}
image: bodhi-base-prebuilt:staging
image: bodhi-base:latest
command: ["/usr/bin/fedora-messaging"]
args: ["consume"]
{% else %}
@ -238,7 +238,7 @@ items:
from:
kind: ImageStreamTag
{% if env == "staging" %}
name: bodhi-base-prebuilt:staging
name: bodhi-base:latest
{% else %}
name: bodhi-consumer:latest
{% endif %}
@ -287,7 +287,7 @@ items:
containers:
- name: bodhi-celery
{% if env == "staging" %}
image: bodhi-base-prebuilt:staging
image: bodhi-base:latest
command: ["/usr/bin/celery"]
args: ["worker", "-A", "bodhi.server.tasks.app", "-l", "info", "-Q", "celery"]
{% else %}
@ -343,7 +343,7 @@ items:
from:
kind: ImageStreamTag
{% if env == "staging" %}
name: bodhi-base-prebuilt:staging
name: bodhi-base:latest
{% else %}
name: bodhi-celery:latest
{% endif %}
@ -390,7 +390,7 @@ items:
containers:
- name: bodhi-celery-beat
{% if env == "staging" %}
image: bodhi-base-prebuilt:staging
image: bodhi-base:latest
workingDir: "/tmp"
command: ["/usr/bin/celery"]
args: ["beat", "-A", "bodhi.server.tasks.app", "-l", "info"]
@ -447,7 +447,7 @@ items:
from:
kind: ImageStreamTag
{% if env == "staging" %}
name: bodhi-base-prebuilt:staging
name: bodhi-base:latest
{% else %}
name: bodhi-celery-beat:latest
{% endif %}

16
roles/openshift-apps/bodhi/templates/dockerfile-base
View file

@ -1,17 +1,18 @@
FROM fedora:30
FROM fedora:31
LABEL \
name="bodhi-base" \
vendor="Fedora Infrastructure" \
license="MIT"
RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags-stg.repo
# While dnf has a --nodocs, it doesen't have a --docs...
RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf
RUN dnf install -y \
git \
python3-pip \
fedora-messaging \
httpd \
intltool \
origin-clients \
python3-alembic \
python3-arrow \
python3-backoff \
@ -32,6 +33,7 @@ RUN dnf install -y \
python3-pyramid \
python3-pyramid-fas-openid \
python3-pyramid-mako \
python3-pyramid_sawing \
python3-bugzilla \
python3-fedora \
python3-pyyaml \
@ -45,16 +47,14 @@ RUN dnf install -y \
koji && \
dnf clean all
#RUN git clone -b 5.1 https://github.com/fedora-infra/bodhi.git /srv/bodhi && \
RUN git clone -b 5.1 https://github.com/pypingou/bodhi.git /srv/bodhi && \
RUN git clone -b staging https://github.com/fedora-infra/bodhi.git /srv/bodhi && \
cd /srv/bodhi && \
git log -1 && \
python3 -m pip install . --no-use-pep517 && \
mkdir -p /usr/share/bodhi && \
cp /srv/bodhi/apache/bodhi.wsgi /usr/share/bodhi/bodhi.wsgi
# Set up krb5
RUN rm -f /etc/krb5.conf && \
ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \
ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab
ENV USER=openshift
ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi.fedoraproject.org.keytab
ENV USER=openshift