From ca8e0e2c97daf1745de8c37572be833455fed6c8 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Thu, 23 Aug 2018 23:03:06 +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 9d0342d..5889463 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,10 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ atomic.type='system' From 555c001057b10f224853e52fdf68e7131d9bdf08 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Thu, 23 Aug 2018 23:03:06 +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 9d0342d..5889463 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,10 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ atomic.type='system' From e61fa01f92329080b0abe5b87a3fbcfbe497ad86 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Thu, 23 Aug 2018 23:14:44 +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 5889463..8afe427 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-master:rawhide +FROM registry.fedoraproject.org/kubernetes-master:29 MAINTAINER "Jason Brooks" ENV container=docker