From 9e337cbd8c3f4a756ab3ac055834c94dcb94b812 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 27 Aug 2018 09:37:47 +0200 Subject: [PATCH 1/5] 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 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f12b34..74b405f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Fedora Infrastructure" -ENV VERSION=0.7.3 RELEASE=1 SUFFIX=fc28 +ENV VERSION=0.7.3 LABEL BZComponent="mirrormanager2-mirrorlist" \ Name="$FGC/mirrormanager2-mirrorlist" \ Version="$VERSION" \ - Release="$RELEASE" \ Architecture="x86_64" RUN dnf install -y mirrormanager2-mirrorlist httpd mod_wsgi From c49c647ecd49ea45b4471a74a796c223d15821df Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 27 Aug 2018 09:40:36 +0200 Subject: [PATCH 2/5] 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 --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f12b34..54f3c65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -FROM registry.fedoraproject.org/fedora:28 +FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Fedora Infrastructure" -ENV VERSION=0.7.3 RELEASE=1 SUFFIX=fc28 +ENV VERSION=0.7.3 LABEL BZComponent="mirrormanager2-mirrorlist" \ Name="$FGC/mirrormanager2-mirrorlist" \ Version="$VERSION" \ - Release="$RELEASE" \ Architecture="x86_64" RUN dnf install -y mirrormanager2-mirrorlist httpd mod_wsgi From 67b62521c6fd86ed1ca03274fc7a3c0b2f91639b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 30 Nov 2018 19:53:59 -0800 Subject: [PATCH 3/5] update version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 54f3c65..0c780cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Fedora Infrastructure" -ENV VERSION=0.7.3 +ENV VERSION=0.8.4 LABEL BZComponent="mirrormanager2-mirrorlist" \ Name="$FGC/mirrormanager2-mirrorlist" \ Version="$VERSION" \ From 3d83467c24be5562a6ecece8197afcb906b76785 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Dec 2018 13:22:33 -0800 Subject: [PATCH 4/5] add GeoIP-GeoLite-data-extra --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0c780cb..4c2dcad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL BZComponent="mirrormanager2-mirrorlist" \ Version="$VERSION" \ 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 RUN dnf install -y patch COPY logging.patch /root From 04d413b8ee1cc9d605c7aa374289d10cf7157f87 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 10 Dec 2018 11:27:50 -0800 Subject: [PATCH 5/5] add missing argument passing fix --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index ecb815d..8136509 100644 --- a/run.sh +++ b/run.sh @@ -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 $@