From 76b59207fd1a024c9f374fa0ad0d00a59ff80e14 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Wed, 1 Nov 2017 14:42:14 -0700 Subject: [PATCH 1/7] set FROM for 27, set version to 0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2051e72..3708767 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=1 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From fbe179ff765a49c510ae8c2cb1b10529f5793e82 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 14 Nov 2017 17:36:10 -0600 Subject: [PATCH 2/7] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3708767..f99c4fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=1 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=2 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 2d8b48f9ccf3058b0783b236855a2151d1e79fae Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 27 Nov 2017 17:23:45 -0800 Subject: [PATCH 3/7] 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 f99c4fe..d4b9d63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=2 ARCH=x86_64 +ENV NAME=kubernetes-scheduler 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 fdd7d06..d2e72e7 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-scheduler-docker.sh" diff --git a/launch.sh b/launch.sh old mode 100644 new mode 100755 From 8e43faa9291cbea66f0dae3d0158c20e8cf5b5a5 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 22 Mar 2018 09:36:49 -0700 Subject: [PATCH 4/7] fix from line --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 77c14ee..b385fdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM registry.fedoraproject.org/kubernetes-master:28 +FROM registry.fedoraproject.org/f28/kubernetes-master:latest + MAINTAINER "Jason Brooks" ENV container=docker From a0553d578233244fc37c4f6f2da00a55ad660267 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 30 May 2018 19:51:50 +0000 Subject: [PATCH 5/7] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b385fdd..d960a68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=1 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From f24814709d9d5691c7fd6596dbe0dbc221e355a3 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 24 Jul 2018 19:36:12 +0000 Subject: [PATCH 6/7] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d960a68..b8f9751 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=1 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=2 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 850a62808b3cda9d650288a2a3f0e70e919e5e92 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:56:52 +0530 Subject: [PATCH 7/7] 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 b8f9751..4c07b6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,10 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=2 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ atomic.type='system'