From d499deb5d22115143b9b360d29cff295a3ebd9e3 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Wed, 1 Nov 2017 14:35:46 -0700 Subject: [PATCH 01/15] set FROM for 27, set version to 0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 41abf8f..146134c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=1 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 3bf11ffc3cd7e3a6e0a4a5bdaef3082f33836e0d Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 14 Nov 2017 17:36:27 -0600 Subject: [PATCH 02/15] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 146134c..2f934fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=1 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=2 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From c87c00b9c51425557d8049abd4b798d7446b498d Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 27 Nov 2017 17:16:16 -0800 Subject: [PATCH 03/15] make run script executable, fix uid/gid --- Dockerfile | 2 +- config.json.template | 4 ++-- launch.sh | 0 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 launch.sh diff --git a/Dockerfile b/Dockerfile index 2f934fb..d42b2f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=2 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=3 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ diff --git a/config.json.template b/config.json.template index bc7e6a8..27cb6e9 100644 --- a/config.json.template +++ b/config.json.template @@ -7,8 +7,8 @@ "process": { "terminal": false, "user": { - "uid": 994, - "gid": 996 + "uid": 996, + "gid": 994 }, "args": [ "/usr/bin/kube-controller-manager-docker.sh" diff --git a/launch.sh b/launch.sh old mode 100644 new mode 100755 From 8ba1a699d7ba24bd2cf91b6e4a8c37049428ba7a Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 28 Nov 2017 12:56:03 -0800 Subject: [PATCH 04/15] fix uid/gid, make launch script executable --- Dockerfile | 4 ++-- config.json.template | 4 ++-- launch.sh | 0 3 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 launch.sh diff --git a/Dockerfile b/Dockerfile index 41abf8f..9d0342d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.fedoraproject.org/f27/kubernetes-master:latest +FROM registry.fedoraproject.org/kubernetes-master:rawhide MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=0 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ diff --git a/config.json.template b/config.json.template index bc7e6a8..27cb6e9 100644 --- a/config.json.template +++ b/config.json.template @@ -7,8 +7,8 @@ "process": { "terminal": false, "user": { - "uid": 994, - "gid": 996 + "uid": 996, + "gid": 994 }, "args": [ "/usr/bin/kube-controller-manager-docker.sh" diff --git a/launch.sh b/launch.sh old mode 100644 new mode 100755 From 3e6c946d3b2072341e95b29cf8a84918e9e68ae5 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 10 Jan 2018 13:38:29 +0000 Subject: [PATCH 05/15] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d42b2f5..260d0b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=3 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=4 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From b9ee3152e48395d71621738f85f888c27e74e41b Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 17:11:01 +0000 Subject: [PATCH 06/15] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 260d0b0..4f5d479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=4 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=5 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 45caaec70c9257b29c3382e1fdec1d6e892cea24 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 19:02:39 +0000 Subject: [PATCH 07/15] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4f5d479..29ffe7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=5 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=6 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From f01d6fe2709853a86f4fd6b4fba09c85383cad33 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 15 Mar 2018 15:39:35 +0000 Subject: [PATCH 08/15] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 29ffe7c..d62e2ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=6 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=7 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 228f8cf8bbc32f83fe93e3835eb66c3012e02ef3 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 20 Mar 2018 12:55:06 -0700 Subject: [PATCH 09/15] from f28 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9d0342d..e86a1c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-master:rawhide +FROM registry.fedoraproject.org/kubernetes-master:28 MAINTAINER "Jason Brooks" ENV container=docker From f5ffaecff4203e20562acab09a5de23fafb178bf Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 20 Mar 2018 12:55:47 -0700 Subject: [PATCH 10/15] revert --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e86a1c0..9d0342d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-master:28 +FROM registry.fedoraproject.org/kubernetes-master:rawhide MAINTAINER "Jason Brooks" ENV container=docker From 82c023c650e2ea1a7e07db2d4379f3ebb55736a1 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 29 Mar 2018 14:44:45 +0000 Subject: [PATCH 11/15] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d62e2ff..3a511f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=7 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=8 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 539da5824f1803f36a737b103209ec6889325896 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 20 Apr 2018 14:44:07 +0000 Subject: [PATCH 12/15] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3a511f5..82d7de8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=9 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 295e767e42836257dc2381354a1084e78b0c6ecf Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 16:01:56 +0000 Subject: [PATCH 13/15] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 82d7de8..65d9212 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=9 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=10 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 6ec069281722446e6e8c92d827c02b6735b73b68 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 19:45:41 +0000 Subject: [PATCH 14/15] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65d9212..5e8fe10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=10 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=11 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From ca8e0e2c97daf1745de8c37572be833455fed6c8 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Thu, 23 Aug 2018 23:03:06 +0530 Subject: [PATCH 15/15] 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'