From 86f5accb2e0c88b91c315a7933c85a204f2ab42b Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Fri, 7 Jul 2017 11:32:03 +1000 Subject: [PATCH 01/15] F26 branch --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33f637b..1aa18f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Dan Callaghan" ENV NAME=waiverdb VERSION=0 RELEASE=1 LABEL com.redhat.component="$NAME" \ From 7a545c8912d2905e4d54e38a97d45ac63e69deff Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Fri, 7 Jul 2017 12:39:24 +1000 Subject: [PATCH 02/15] F25 branch --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33f637b..7dc595b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Dan Callaghan" ENV NAME=waiverdb VERSION=0 RELEASE=1 LABEL com.redhat.component="$NAME" \ From 873d4bc976ec660f7141cc67d3559a91caa989eb Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Jul 2017 12:57:10 -0500 Subject: [PATCH 03/15] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7dc595b..b1fbdf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=1 +ENV NAME=waiverdb VERSION=0 RELEASE=2 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 21adf1e76b8dadffc3727f97270b669d0529daea Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Jul 2017 16:23:09 -0500 Subject: [PATCH 04/15] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1aa18f6..b7d477b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=1 +ENV NAME=waiverdb VERSION=0 RELEASE=2 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From ca18371fd32e56c399dccb5fdcb8a37f491ab661 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 15:39:05 -0500 Subject: [PATCH 05/15] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1fbdf6..8b1d1c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=2 +ENV NAME=waiverdb VERSION=0 RELEASE=3 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From c730919117d9db57ca3e58769b372a0107d5c3f4 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 16:54:25 -0500 Subject: [PATCH 06/15] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b7d477b..e3ec373 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=2 +ENV NAME=waiverdb VERSION=0 RELEASE=3 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From f6c8a61e41997905ea4b4d944b29c0a813ca1465 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 10:24:32 -0500 Subject: [PATCH 07/15] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b1d1c0..82386b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=3 +ENV NAME=waiverdb VERSION=0 RELEASE=4 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 2be9a61de1ca1abb5e063fd3527a37d986fee376 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 14:01:54 -0500 Subject: [PATCH 08/15] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3ec373..cd12564 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=3 +ENV NAME=waiverdb VERSION=0 RELEASE=4 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 65e2ef878d6610e93eb1897d4b3a56fd965d0210 Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Fri, 29 Sep 2017 11:41:11 +1000 Subject: [PATCH 09/15] Bump RELEASE to 5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cd12564..1504014 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=4 +ENV NAME=waiverdb VERSION=0 RELEASE=5 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 0da836bc39025e3976d11015951808c49111a9e0 Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Fri, 29 Sep 2017 11:53:09 +1000 Subject: [PATCH 10/15] 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 11/15] 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 f0e1a125a44a71cabf9f760b9c64847341e664d1 Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Fri, 29 Sep 2017 13:17:22 +1000 Subject: [PATCH 12/15] Bump RELEASE to 6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 82386b9..666f6c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Dan Callaghan" -ENV NAME=waiverdb VERSION=0 RELEASE=4 +ENV NAME=waiverdb VERSION=0 RELEASE=6 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From aa4701c84e3af0d0c957ad662c9b59510dbb9454 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 6 Nov 2017 16:30:17 -0500 Subject: [PATCH 13/15] A few fixes for fedmsg.publish. --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 666f6c8..1004ae6 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 85f5fd23621c820b249d4ddff53a28ae49ec8d45 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 6 Nov 2017 16:30:17 -0500 Subject: [PATCH 14/15] 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 15/15] 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.