From b2f462c71de5cad007e869fe8ef22c104f9b4a87 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Thu, 23 Aug 2018 22:45:36 +0530 Subject: [PATCH 1/3] 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: Bhavin Gandhi --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f1f5b8..47bfd0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-master VERSION=1.7.1 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-master VERSION=1.7.1 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" RUN dnf -y update && dnf clean all From cc2f30e6ab642303ba650c36083c495089178343 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Thu, 23 Aug 2018 22:45:36 +0530 Subject: [PATCH 2/3] 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: Bhavin Gandhi --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f1f5b8..47bfd0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-master VERSION=1.7.1 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-master VERSION=1.7.1 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" RUN dnf -y update && dnf clean all From 416da1b71cc166c4756e9d281406d0f303e5fc6d Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Thu, 23 Aug 2018 22:53:02 +0530 Subject: [PATCH 3/3] Use 29 tag for f29 branch Signed-off-by: Bhavin Gandhi --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 47bfd0a..1bced3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:29 MAINTAINER "Jason Brooks" ENV NAME=kubernetes-master VERSION=1.7.1 ARCH=x86_64