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

[release-monitoring] Update container to F38

Browse source 
The F36 container is failing in staging when build is running. I updated the
[dev env to F38](https://github.com/fedora-infra/anitya/pull/1567) to try if
the issue will still be there and it didn't show up. Let's update the OpenShift
deployment as well.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný 2023-04-25 15:07:03 +02:00
parent dc0b0f1d7e
commit 1a18cd1751
2 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
roles/openshift-apps/release-monitoring/templates/buildconfig.yml
View file

@ -11,7 +11,7 @@ items:
runPolicy: Serial runPolicy: Serial
source: source:
dockerfile: |- dockerfile: |-
FROM fedora:36 FROM fedora:38
LABEL \ LABEL \
name="release-monitoring-web" \ name="release-monitoring-web" \
vendor="Fedora Infrastructure" \ vendor="Fedora Infrastructure" \
@ -29,7 +29,6 @@ items:
python3-dateutil \ python3-dateutil \
python3-defusedxml \ python3-defusedxml \
python3-flask-login \ python3-flask-login \
python3-flask-restful \
python3-flask-wtf \ python3-flask-wtf \
python3-jinja2 \ python3-jinja2 \
python3-mod_wsgi \ python3-mod_wsgi \
@ -46,10 +45,6 @@ items:
python3-wtforms && \ python3-wtforms && \
dnf autoremove -y && \ dnf autoremove -y && \
dnf clean all -y dnf clean all -y
# Install newer version of flask-login than what is available in Fedora 36
# It has issue with werkzeug package available in Fedora
# See https://github.com/maxcountryman/flask-login/pull/691 for more info
RUN pip install Flask-Login==0.6.2
RUN git clone https://github.com/fedora-infra/anitya.git && \ RUN git clone https://github.com/fedora-infra/anitya.git && \
pushd anitya && \ pushd anitya && \
{% if env == 'staging' %} {% if env == 'staging' %}
@ -78,12 +73,12 @@ items:
rm -rf anitya rm -rf anitya
{% if env == 'staging' %} {% if env == 'staging' %}
# Let's use staging auth server in staging # Let's use staging auth server in staging
RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.10/site-packages/social_core/backends/fedora.py RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.11/site-packages/social_core/backends/fedora.py
{% endif %} {% endif %}
# Hotfix for social_auth-sqlalchemy # Hotfix for social_auth-sqlalchemy
# Could be removed when we switch to something else # Could be removed when we switch to something else
RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.10/site-packages/social_sqlalchemy/storage.py RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.11/site-packages/social_sqlalchemy/storage.py
RUN mkdir /httpdir RUN mkdir /httpdir
RUN chmod 777 /httpdir RUN chmod 777 /httpdir
EXPOSE 8080 EXPOSE 8080

8
roles/openshift-apps/release-monitoring/templates/httpd.conf
View file

@ -27,11 +27,11 @@ StartServers 20
ServerLimit 100 ServerLimit 100
MaxRequestsPerChild 2000 MaxRequestsPerChild 2000
MaxRequestWorkers 100 MaxRequestWorkers 100
<Directory "/usr/local/lib/python3.10/anitya/static/docs/html/"> <Directory "/usr/local/lib/python3.11/anitya/static/docs/html/">
AllowOverride None AllowOverride None
Require all granted Require all granted
</Directory> </Directory>
<Directory "/usr/local/lib/python3.10/site-packages/anitya/static/"> <Directory "/usr/local/lib/python3.11/site-packages/anitya/static/">
AllowOverride None AllowOverride None
Require all granted Require all granted
</Directory> </Directory>
@ -55,8 +55,8 @@ LogLevel info
TypesConfig /etc/mime.types TypesConfig /etc/mime.types
AddDefaultCharset UTF-8 AddDefaultCharset UTF-8
CoreDumpDirectory /tmp CoreDumpDirectory /tmp
Alias /docs /usr/local/lib/python3.10/site-packages/anitya/static/docs/html/ Alias /docs /usr/local/lib/python3.11/site-packages/anitya/static/docs/html/
Alias /static /usr/local/lib/python3.10/site-packages/anitya/static/ Alias /static /usr/local/lib/python3.11/site-packages/anitya/static/
WSGIDaemonProcess anitya display-name=anitya processes=2 threads=2 maximum-requests=1000 home=/httpdir WSGIDaemonProcess anitya display-name=anitya processes=2 threads=2 maximum-requests=1000 home=/httpdir
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGISocketPrefix run/wsgi WSGISocketPrefix run/wsgi