From cf334d024a24bcbdc619b398a7581ebaa319cd90 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:19:59 +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 2cd9ee2..f83b56b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,10 @@ FROM registry.fedoraproject.org/kubernetes-node:rawhide ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ atomic.type='system' \ maintainer="Jason Brooks " From c338dca99425c00a999055e66654dba3788bf6dc Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:19:59 +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 2cd9ee2..f83b56b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,10 @@ FROM registry.fedoraproject.org/kubernetes-node:rawhide ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ atomic.type='system' \ maintainer="Jason Brooks " From 99636e7114db1d35f11383e77b0ca6e35999dc47 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:24:01 +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 f83b56b..7c0a495 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-node:rawhide +FROM registry.fedoraproject.org/kubernetes-node:29 ENV container=docker