Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Kevin Fenzi
ce378b82ba Try and adjust wsgi params to better work for fedora infra.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-02-14 10:55:09 -08:00
Kevin Fenzi
a29f65ee6a a whitespace change 2018-12-12 10:44:42 -08:00
Kevin Fenzi
630da4ea2e add missing argument passing fix 2018-12-10 11:28:44 -08:00
Kevin Fenzi
b06b3e4ddb add GeoIP-GeoLite-data-extra 2018-12-07 13:23:36 -08:00
Kevin Fenzi
6165125fda update to 0.8.4 2018-11-30 20:00:04 -08:00
Clement Verna
0666f3ce79 Drop Release label in favor of OSBS release_bump plugin.
OSBS can automatically bump the release number, for that
we just need to drop the label from the Dockerfile

See https://pagure.io/ContainerSIG/container-sig/issue/1

Signed-off-by: Clement Verna <cverna@tutanota.com>
2018-08-27 09:38:58 +02:00
2 changed files with 7 additions and 5 deletions

View file

@ -1,18 +1,19 @@
FROM registry.fedoraproject.org/fedora:28
FROM registry.fedoraproject.org/fedora:29
MAINTAINER "Fedora Infrastructure" <admin@fedoraproject.org>
ENV VERSION=0.7.3 RELEASE=1 SUFFIX=fc28
ENV VERSION=0.8.4
LABEL BZComponent="mirrormanager2-mirrorlist" \
Name="$FGC/mirrormanager2-mirrorlist" \
Version="$VERSION" \
Release="$RELEASE" \
Architecture="x86_64"
RUN dnf install -y mirrormanager2-mirrorlist httpd mod_wsgi
RUN dnf install -y mirrormanager2-mirrorlist httpd mod_wsgi GeoIP-GeoLite-data-extra sed
RUN dnf install -y patch
COPY logging.patch /root
RUN patch -p1 /usr/share/mirrormanager2/mirrorlist_server.py </root/logging.patch
# Change wsgi options see https://pagure.io/fedora-infrastructure/issue/7553
RUN sed -i -e 's|WSGIDaemonProcess mirrorlist user=apache processes=45 threads=1 display-name=mirrorlist maximum-requests=1000|WSGIDaemonProcess mirrorlist user=apache processes=20 threads=1 display-name=mirrorlist graceful-timeout=30 maximum-requests=1000 request-timeout=30 listen-backlog=1000 queue-timeout=30|' /etc/httpd/conf.d/mirrorlist-server.conf
COPY run.sh /root
RUN chmod +x /root/run.sh
@ -21,3 +22,4 @@ VOLUME ["/var/lib/mirrormanager"]
EXPOSE 80
ENTRYPOINT ["/usr/bin/bash", "/root/run.sh"]
CMD []

2
run.sh
View file

@ -1,3 +1,3 @@
#!/bin/bash
/usr/sbin/httpd &
/usr/bin/python2 /usr/share/mirrormanager2/mirrorlist_server.py
/usr/bin/python2 /usr/share/mirrormanager2/mirrorlist_server.py $@