Bump RELEASE for automatic rebuild

2017-09-21 10:24:23 -05:00 · 2017-08-24 15:38:48 -05:00 · 2017-07-25 12:57:24 -05:00 · 2017-07-06 14:05:09 -05:00 · 2017-06-27 10:45:53 -05:00 · 2017-06-14 16:26:19 -05:00
3 changed files with 15 additions and 8 deletions
--- a/20
+++ b/20
@ -1,13 +1,18 @@
-FROM registry.fedoraproject.org/fedora:rawhide
+FROM registry.fedoraproject.org/fedora:25
 MAINTAINER "Fedora Infrastructure" <admin@fedoraproject.org>

-ENV VERSION=0.8.4
-LABEL BZComponent="mirrormanager2-mirrorlist" \
-	Name="$FGC/mirrormanager2-mirrorlist" \
-	Version="$VERSION" \
-	Architecture="x86_64"
+ENV NAME=mirrormanager2-mirrorlist VERSION=0.7.3 RELEASE=11 ARCH=x86_64
+LABEL   com.redhat.component="$NAME" \
+        name="$FGC/$NAME" \
+        version="$VERSION" \
+        release="$RELEASE.$DISTTAG" \
+        architecture="$ARCH" \
+        usage="docker run -p 9000:9000 f25/mirrormanager2-mirrorlist" \
+        help="Runs mirrormanager2 mirrorlist server. Needs a data pkl in /srv/ and listens on port 80" 

-RUN dnf install -y mirrormanager2-mirrorlist httpd mod_wsgi GeoIP-GeoLite-data-extra
+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 patch
 COPY logging.patch /root
@ -17,6 +22,7 @@ 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 []
--- a/headers.conf
+++ b/headers.conf
@ -0,0 +1 @@
+Header set ServedFrom "ContainerInfra"
--- a/run.sh
+++ b/run.sh
@ -1,3 +1,3 @@
 #!/bin/bash
 /usr/sbin/httpd &
-/usr/bin/python2 /usr/share/mirrormanager2/mirrorlist_server.py $@
+exec /usr/bin/python2 /usr/share/mirrormanager2/mirrorlist_server.py $@
Author	SHA1	Message	Date
Adam Miller	b5c3875405	Bump RELEASE for automatic rebuild	2017-09-21 10:24:23 -05:00
Adam Miller	84997d5202	Bump RELEASE for automatic rebuild	2017-08-24 15:38:48 -05:00
Adam Miller	322c08bf9e	Bump RELEASE for automatic rebuild	2017-07-25 12:57:24 -05:00
Adam Miller	5105bf5743	Bump RELEASE for automatic rebuild	2017-07-06 14:05:09 -05:00
Adam Miller	f9ead267db	Bump RELEASE for automatic rebuild	2017-06-27 10:45:53 -05:00
Adam Miller	968147e97c	Bump RELEASE for automatic rebuild	2017-06-14 16:26:19 -05:00
Adam Miller	6b50a2bb0f	Bump RELEASE for automatic rebuild	2017-06-08 22:21:57 -05:00
Adam Miller	55cdec6f80	Bump RELEASE for automatic rebuild	2017-05-23 16:17:52 -05:00
Kevin Fenzi	333f48ca13	update to current container guidelines	2017-04-26 11:17:55 -06:00
Patrick Uiterwijk	546b8b65f4	Deliver a header file Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>	2017-02-08 22:29:07 +00:00
Patrick Uiterwijk	2a8e0dfa18	Pass additional arguments, and replace pid1 Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>	2017-02-07 00:38:50 +00:00
Patrick Uiterwijk	c82b2d127b	Add /var/log/mirrormanager volume Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>	2017-02-07 00:16:58 +00:00
Kevin Fenzi	baa3678bf9	also need GeoIP-GeoLite-data	2017-02-06 15:11:42 -07:00
Kevin Fenzi	78f677943d	need GeoIP-GeoLite-data-extra also	2017-02-06 14:28:36 -07:00
Kevin Fenzi	893c5393f3	turns out we need python2 also	2017-02-06 14:11:36 -07:00
Kevin Fenzi	3dcea73e53	f25 versions for f25 branch	2017-02-06 12:42:53 -07:00