From 5f52fb6c3190a639586774891e336c78b33d22a0 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 28 Nov 2017 13:03:17 -0800 Subject: [PATCH 1/2] fix uid/gid, make launch.sh 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 2051e72..41fb18e 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-scheduler VERSION=0.1 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-scheduler 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 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 5be7e79dfbcc6add5c28e1fe9fdcc54009380901 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Sun, 26 Aug 2018 23:56:52 +0530 Subject: [PATCH 2/2] 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 41fb18e..9752ce9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,10 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=0 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'