From e782934d687c0354cfd4caf925aed85eacf5a52d Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 9 Jan 2017 13:50:11 -0800 Subject: [PATCH 01/25] first import of kubernetes-scheduler Dockerfile and files --- Dockerfile | 15 +++++++++++++++ launch.sh | 8 ++++++++ 2 files changed, 23 insertions(+) create mode 100644 Dockerfile create mode 100755 launch.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..529eaa5 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM registry.fedoraproject.org/kubernetes-master:f25 +MAINTAINER "Jason Brooks" + +ENV NAME=kube-scheduler VERSION=0.1 RELEASE=1 ARCH=x86_64 +LABEL BZComponent="kubernetes" \ + Name="$FGC/$NAME" \ + Version="$VERSION" \ + Release="$RELEASE.$DISTTAG" \ + Architecture="$ARCH" + +COPY launch.sh /usr/bin/kube-scheduler-docker.sh + +LABEL RUN /usr/bin/docker run -d --net=host + +ENTRYPOINT ["/usr/bin/kube-scheduler-docker.sh"] diff --git a/launch.sh b/launch.sh new file mode 100755 index 0000000..ce28a97 --- /dev/null +++ b/launch.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +source /etc/kubernetes/scheduler +source /etc/kubernetes/config + +ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_SCHEDULER_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs) + +exec /usr/bin/kube-scheduler $ARGS From 9117f8900a13e056235b890deb6e744eaa730139 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Fri, 17 Feb 2017 11:39:23 -0800 Subject: [PATCH 02/25] fix FROM line --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 529eaa5..7c18a93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-master:f25 +FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" ENV NAME=kube-scheduler VERSION=0.1 RELEASE=1 ARCH=x86_64 From dbdf15ccbd5ae5f30a47a7489f61243bbf39b103 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Fri, 17 Feb 2017 11:44:40 -0800 Subject: [PATCH 03/25] bump release --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c18a93..1457ee0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kube-scheduler VERSION=0.1 RELEASE=1 ARCH=x86_64 +ENV NAME=kube-scheduler VERSION=0.1 RELEASE=2 ARCH=x86_64 LABEL BZComponent="kubernetes" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From a403851af32e1fd362ab575e1e418b6eb8b51202 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 2 Mar 2017 22:48:03 -0800 Subject: [PATCH 04/25] fix bzcomponent label --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1457ee0..4af7c57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kube-scheduler VERSION=0.1 RELEASE=2 ARCH=x86_64 -LABEL BZComponent="kubernetes" \ +ENV NAME=kube-scheduler VERSION=0.1 RELEASE=3 ARCH=x86_64 +LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ Release="$RELEASE.$DISTTAG" \ From 1c6b6ac46d8d5230d1a6f246a259491cd176c8fa Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 7 Mar 2017 10:08:46 -0800 Subject: [PATCH 05/25] fix component name --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4af7c57..b8987e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kube-scheduler VERSION=0.1 RELEASE=3 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=4 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From dddd444a3724904490bbd3ffd159bf06da50e893 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 16:49:44 -0500 Subject: [PATCH 06/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b8987e7..b6f3b44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=4 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=5 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From d70dd94c1dd4c696f70afd2046fa394a00d931d7 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 17:24:17 -0500 Subject: [PATCH 07/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b6f3b44..739d543 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=5 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=6 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 3454dba49407081996395e3560dcdcb96b844857 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 15:17:24 -0500 Subject: [PATCH 08/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 739d543..45c6990 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=6 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=7 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From b7c3bf27cf16886713aee7628c18c67c0b4e4ecd Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 22:38:46 -0500 Subject: [PATCH 09/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45c6990..8f2db65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=7 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=8 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From f0a9d5ccd7fd48839275304519112e50809c7500 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 20 Apr 2017 21:33:33 -0500 Subject: [PATCH 10/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8f2db65..d619524 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=9 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 292bd337a2eaf4f7351b0b01a00b6b776bd211ab Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 16:16:44 -0500 Subject: [PATCH 11/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d619524..9f97198 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=9 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=10 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 18d8f5cb5fc96580544c42cff0021de652b09fc1 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 17:57:10 -0500 Subject: [PATCH 12/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f97198..64433d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=10 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=11 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From fc06e714534d8ce1a777b177fe8eea74705eed60 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 22:27:53 -0500 Subject: [PATCH 13/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 64433d0..73a215f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=11 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=12 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 8b235a8e3af8201e5a94000a355c988b76ede557 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 14 Jun 2017 22:03:08 -0500 Subject: [PATCH 14/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 73a215f..27426f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=12 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=13 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From ea3016f843cf8409e099abb6f4afd24768e327c2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 27 Jun 2017 11:49:30 -0500 Subject: [PATCH 15/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 27426f1..7909704 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=13 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=14 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 420d4efd03d95d89f6ad932a540017446520d5f9 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 27 Jun 2017 12:20:45 -0500 Subject: [PATCH 16/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7909704..fa51bdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=14 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=15 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From ed26056c063dd0e72bcc0957233f7b608b156add Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 6 Jul 2017 12:38:19 -0700 Subject: [PATCH 17/25] initial commit --- Dockerfile | 22 ++++++ config.json.template | 184 +++++++++++++++++++++++++++++++++++++++++++ launch.sh | 8 ++ service.template | 12 +++ 4 files changed, 226 insertions(+) create mode 100644 Dockerfile create mode 100644 config.json.template create mode 100644 launch.sh create mode 100644 service.template diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3244fec --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +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 +LABEL bzcomponent="$NAME" \ + name="$FGC/$NAME" \ + version="$VERSION" \ + release="$RELEASE.$DISTTAG" \ + architecture="$ARCH" \ + atomic.type='system' + +COPY launch.sh /usr/bin/kube-scheduler-docker.sh + +LABEL RUN /usr/bin/docker run -d --net=host + +COPY service.template config.json.template /exports/ + +RUN mkdir -p /exports/hostfs/etc/kubernetes && cp /etc/kubernetes/{config,scheduler} /exports/hostfs/etc/kubernetes + +ENTRYPOINT ["/usr/bin/kube-scheduler-docker.sh"] diff --git a/config.json.template b/config.json.template new file mode 100644 index 0000000..fdd7d06 --- /dev/null +++ b/config.json.template @@ -0,0 +1,184 @@ +{ + "ociVersion": "1.0.0", + "platform": { + "os": "linux", + "arch": "amd64" + }, + "process": { + "terminal": false, + "user": { + "uid": 994, + "gid": 996 + }, + "args": [ + "/usr/bin/kube-scheduler-docker.sh" + ], + "env": [ + "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + "TERM=xterm" + ], + "cwd": "/", + "capabilities": { + "bounding": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ], + "permitted": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ], + "inheritable": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ], + "effective": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ], + "ambient": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ] + }, + "rlimits": [ + { + "type": "RLIMIT_NOFILE", + "hard": 1024, + "soft": 1024 + } + ] + }, + "root": { + "path": "rootfs", + "readonly": true + }, + "mounts": [ + { + "destination": "/proc", + "type": "proc", + "source": "proc" + }, + { + "destination": "/dev", + "type": "tmpfs", + "source": "tmpfs", + "options": [ + "nosuid", + "strictatime", + "mode=755", + "size=65536k" + ] + }, + { + "destination": "/dev/pts", + "type": "devpts", + "source": "devpts", + "options": [ + "nosuid", + "noexec", + "newinstance", + "ptmxmode=0666", + "mode=0620", + "gid=5" + ] + }, + { + "destination": "/dev/shm", + "type": "tmpfs", + "source": "shm", + "options": [ + "nosuid", + "noexec", + "nodev", + "mode=1777", + "size=65536k" + ] + }, + { + "destination": "/dev/mqueue", + "type": "mqueue", + "source": "mqueue", + "options": [ + "nosuid", + "noexec", + "nodev" + ] + }, + { + "destination": "/sys", + "type": "sysfs", + "source": "sysfs", + "options": [ + "nosuid", + "noexec", + "nodev" + ] + }, + { + "destination": "/sys/fs/cgroup", + "type": "cgroup", + "source": "cgroup", + "options": [ + "nosuid", + "noexec", + "nodev", + "relatime", + "ro" + ] + }, + { + "type": "bind", + "source": "/etc/kubernetes", + "destination": "/etc/kubernetes", + "options": [ + "rbind", + "ro", + "rprivate" + ] + }, + { + "destination": "/etc/resolv.conf", + "type": "bind", + "source": "/etc/resolv.conf", + "options": [ + "ro", + "rbind", + "rprivate" + ] + } + ], + "linux": { + "resources": { + "devices": [ + { + "allow": false, + "access": "rwm" + } + ] + }, + "namespaces": [ + { + "type": "pid" + }, + { + "type": "ipc" + }, + { + "type": "mount" + } + ], + "devices": null, + "apparmorProfile": "", + "selinuxProcessLabel": "" + } +} diff --git a/launch.sh b/launch.sh new file mode 100644 index 0000000..ce28a97 --- /dev/null +++ b/launch.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +source /etc/kubernetes/scheduler +source /etc/kubernetes/config + +ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_SCHEDULER_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs) + +exec /usr/bin/kube-scheduler $ARGS diff --git a/service.template b/service.template new file mode 100644 index 0000000..d5a7e5e --- /dev/null +++ b/service.template @@ -0,0 +1,12 @@ +[Unit] +Description=kubernetes-scheduler + +[Service] +ExecStart=$EXEC_START +ExecStop=$EXEC_STOP +Restart=on-failure +WorkingDirectory=$DESTDIR + +[Install] +WantedBy=multi-user.target + From 4879f443fc4594bff79b67c98eab17031bf56a99 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 6 Jul 2017 13:12:53 -0700 Subject: [PATCH 18/25] fix BZComponent capitalization --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3244fec..a6e15a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER "Jason Brooks" ENV container=docker ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=8 ARCH=x86_64 -LABEL bzcomponent="$NAME" \ +LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ release="$RELEASE.$DISTTAG" \ From f9d158e500a858bf500a8620e4a2aac480b5c749 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 6 Jul 2017 15:27:19 -0500 Subject: [PATCH 19/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fa51bdd..2c1d002 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=15 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=16 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 9eb014322d863e7f03c53bc14191b65a7f27b9f6 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 6 Jul 2017 14:04:46 -0700 Subject: [PATCH 20/25] build from f27 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a6e15a5..2051e72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-master:rawhide +FROM registry.fedoraproject.org/f27/kubernetes-master:latest MAINTAINER "Jason Brooks" ENV container=docker From d90feca3fd2696fb1cb94c8353cbcc8fe80d78a9 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Jul 2017 14:54:12 -0500 Subject: [PATCH 21/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c1d002..e2df856 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=16 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=17 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 31b365521f558bd9df282669084601763a66c56a Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 16:29:17 -0500 Subject: [PATCH 22/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2df856..0e3c8ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=17 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=18 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 94ea97766f89cb965b4660abc25377af66dc6ec2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 12:18:47 -0500 Subject: [PATCH 23/25] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e3c8ea..3a6661a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=18 ARCH=x86_64 +ENV NAME=kubernetes-scheduler VERSION=0.1 RELEASE=19 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 5f52fb6c3190a639586774891e336c78b33d22a0 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 28 Nov 2017 13:03:17 -0800 Subject: [PATCH 24/25] 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 25/25] 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'