Compare commits

..

5 commits

Author SHA1 Message Date
Kevin Fenzi
04d413b8ee add missing argument passing fix 2018-12-10 11:27:50 -08:00
Kevin Fenzi
3d83467c24 add GeoIP-GeoLite-data-extra 2018-12-07 13:22:33 -08:00
Kevin Fenzi
67b62521c6 update version 2018-11-30 19:53:59 -08:00
Clement Verna
c49c647ecd 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:40:36 +02:00
Kevin Fenzi
250b82da3b update rawhide mirrormanager2-mirrorlist container 2018-02-01 11:51:03 -08:00
3 changed files with 8 additions and 15 deletions

View file

@ -1,18 +1,13 @@
FROM registry.fedoraproject.org/fedora:26
FROM registry.fedoraproject.org/fedora:rawhide
MAINTAINER "Fedora Infrastructure" <admin@fedoraproject.org>
ENV NAME=mirrormanager2-mirrorlist VERSION=0.7.3 RELEASE=13 ARCH=x86_64
LABEL com.redhat.component="$NAME" \
name="$FGC/$NAME" \
version="$VERSION" \
release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \
usage="docker run -p 9000:9000 f26/mirrormanager2-mirrorlist" \
help="Runs mirrormanager2 mirrorlist server. Needs a data pkl in /srv/ and listens on port 80"
ENV VERSION=0.8.4
LABEL BZComponent="mirrormanager2-mirrorlist" \
Name="$FGC/mirrormanager2-mirrorlist" \
Version="$VERSION" \
Architecture="x86_64"
RUN dnf install -y mirrormanager2-mirrorlist httpd mod_wsgi python GeoIP-GeoLite-data GeoIP-GeoLite-data-extra
COPY headers.conf /etc/httpd/conf.d/
RUN dnf install -y mirrormanager2-mirrorlist httpd mod_wsgi GeoIP-GeoLite-data-extra
RUN dnf install -y patch
COPY logging.patch /root
@ -22,7 +17,6 @@ COPY run.sh /root
RUN chmod +x /root/run.sh
VOLUME ["/var/lib/mirrormanager"]
VOLUME ["/var/log/mirrormanager"]
EXPOSE 80
ENTRYPOINT ["/usr/bin/bash", "/root/run.sh"]
CMD []

View file

@ -1 +0,0 @@
Header set ServedFrom "ContainerInfra"

2
run.sh
View file

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