From 0da836bc39025e3976d11015951808c49111a9e0 Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Fri, 29 Sep 2017 11:53:09 +1000 Subject: [PATCH 1/4] Revert "F26 branch" This reverts commit 86f5accb2e0c88b91c315a7933c85a204f2ab42b. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1504014..d26cec3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:26 +FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Dan Callaghan" ENV NAME=waiverdb VERSION=0 RELEASE=5 LABEL com.redhat.component="$NAME" \ From 7f95278e56edc30adbcc7085ee99c1832867e188 Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Fri, 29 Sep 2017 11:55:50 +1000 Subject: [PATCH 2/4] Bump RELEASE to 6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d26cec3..0f6a193 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=5 +ENV NAME=waiverdb VERSION=0 RELEASE=6 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 85f5fd23621c820b249d4ddff53a28ae49ec8d45 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 6 Nov 2017 16:30:17 -0500 Subject: [PATCH 3/4] A few fixes for fedmsg.publish. (cherry picked from commit f470eb42eaae131bf587087707ee9e0b8a565d67) --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0f6a193..aaa5a65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,10 @@ RUN dnf -y install --setopt=tsflags=nodocs \ waiverdb \ && dnf -y clean all COPY README.md /README.md +# Make sure fedmsg can write its CRL. +RUN chmod 777 /var/run/fedmsg/ +# Declare a user so that fedmsg.publish works. +ENV USER=openshift USER 1001 EXPOSE 8080 ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- waiverdb.wsgi:app From 22b9ac54b2031923d17045e7a7088a3dcc56af87 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Thu, 10 May 2018 15:48:23 +0200 Subject: [PATCH 4/4] update for waiverdb 0.10.0 (cherry picked from commit b3ecca7cb0baf542b330816bd0e20440d8ddf278) --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aaa5a65..be9c3d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=6 +ENV NAME=waiverdb VERSION=0 RELEASE=14 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ @@ -11,7 +11,8 @@ LABEL com.redhat.component="$NAME" \ RUN dnf -y install --setopt=tsflags=nodocs \ python-gunicorn \ python-psycopg2 \ - waiverdb \ + https://kojipkgs.fedoraproject.org//packages/waiverdb/0.10.0/1.fc26/noarch/waiverdb-0.10.0-1.fc26.noarch.rpm \ + https://kojipkgs.fedoraproject.org//packages/waiverdb/0.10.0/1.fc26/noarch/waiverdb-common-0.10.0-1.fc26.noarch.rpm \ && dnf -y clean all COPY README.md /README.md # Make sure fedmsg can write its CRL.