From 5046a8cc5f8fc911b5338a869515ecb52bec1c7c Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:33:47 +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 99bb500..f8e72ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-node VERSION=1.7.1 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-node 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 4001eb2fb7dcae8f34be81cb32d2a345460419e4 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:33:47 +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 99bb500..f8e72ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-node VERSION=1.7.1 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-node 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 a194d3785f0dced40a280fdd8ec0cc49f2841223 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:36:25 +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 f8e72ce..6188d3b 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-node VERSION=1.7.1 ARCH=x86_64