From e4edb438819630b7922be89db63a8e9577d6ff2e Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 19:47:45 +0200 Subject: [PATCH 1/2] Use rawhide tag for master branch Signed-off-by: Clement Verna --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ca3cc0..75e5002 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:26 +FROM registry.fedoraproject.org/fedora:rawhide ENV NAME=haproxy ARCH=x86_64 LABEL MAINTAINER "Petr Hracek" From c529c28f110abdad040f5018ab0a3c06e047fb0b Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 19:47:57 +0200 Subject: [PATCH 2/2] 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 75e5002..89014dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ LABEL MAINTAINER "Petr Hracek" LABEL summary="HAProxy reverse proxy for high availability environments." \ name="$FGC/$NAME" \ version="0" \ - release="1.$DISTTAG" \ architecture="$ARCH" \ com.redhat.component=$NAME \ usage="docker run -p 80:80 docker.io/modularityimages/haproxy" \