From 502959b2aa199a1e76ea3d2d23a9e49c732b35f9 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 20 Mar 2018 13:20:48 -0700 Subject: [PATCH 01/10] from rawhide --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7652f7..a4f3456 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-node:28 +FROM registry.fedoraproject.org/kubernetes-node:rawhide ENV container=docker From 464d7a8324b86bab1fbbeb87446ca459e21640ca Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 22 Mar 2018 09:40:14 -0700 Subject: [PATCH 02/10] fix from line --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7652f7..dcb9395 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-node:28 +FROM registry.fedoraproject.org/f28/kubernetes-node:latest ENV container=docker From 587358c3f11da5eb6a277855e40130d23a8adb00 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 17 May 2018 13:49:20 -0700 Subject: [PATCH 03/10] fix BZComponent capitalization --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dcb9395..ffe28f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM registry.fedoraproject.org/f28/kubernetes-node:latest ENV container=docker ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=0 ARCH=x86_64 -LABEL bzcomponent="$NAME" \ +LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ release="$RELEASE.$DISTTAG" \ From 99dce7ecadd8c390d075f194038cf1016a91acf7 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 17 May 2018 13:52:04 -0700 Subject: [PATCH 04/10] fix BZComponent capitalization --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a4f3456..2cd9ee2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM registry.fedoraproject.org/kubernetes-node:rawhide ENV container=docker ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=0 ARCH=x86_64 -LABEL bzcomponent="$NAME" \ +LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ release="$RELEASE.$DISTTAG" \ From 4802bd76d3b11da976f3e45e6acfd876adfd9990 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 30 May 2018 20:10:37 +0000 Subject: [PATCH 05/10] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ffe28f2..ad25f6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM registry.fedoraproject.org/f28/kubernetes-node:latest ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=1 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 267ac0f8a01613f0a90598978dbf31e5669c20e0 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 24 Jul 2018 20:45:38 +0000 Subject: [PATCH 06/10] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad25f6a..30bb2a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM registry.fedoraproject.org/f28/kubernetes-node:latest ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=1 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=2 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From cf334d024a24bcbdc619b398a7581ebaa319cd90 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:19:59 +0530 Subject: [PATCH 07/10] 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 08/10] 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 09/10] 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 From e29dc78668aa96918f6ea45c95303895be47acff Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:19:59 +0530 Subject: [PATCH 10/10] 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 30bb2a3..a2cef11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,10 @@ FROM registry.fedoraproject.org/f28/kubernetes-node:latest ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=2 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 "