From 62defa108af906299816bd42219b1c431d1a54d3 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Wed, 1 Nov 2017 14:24:19 -0700 Subject: [PATCH 01/18] set FROM for 27, set version to 0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b386efb..880095a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM candidate-registry.fedoraproject.org/f27/kubernetes-master:1.7.1 +FROM candidate-registry.fedoraproject.org/f27/kubernetes-master:latest MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=1.7.1 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=1 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From c1fe15249c004e7199cf08f7aae90cb1d611870f Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Wed, 1 Nov 2017 14:28:40 -0700 Subject: [PATCH 02/18] fix FROM --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 880095a..e613d7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM candidate-registry.fedoraproject.org/f27/kubernetes-master:latest +FROM registry.fedoraproject.org/f27/kubernetes-master:latest MAINTAINER "Jason Brooks" ENV container=docker From e7e997ca612088a8f4f4c6b47ba0a6a617526c2e Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 14 Nov 2017 17:36:18 -0600 Subject: [PATCH 03/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e613d7a..7b10a8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=1 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=2 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 132bac9f9a002ec8faa5c59218abb5062802b22f Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 27 Nov 2017 12:30:06 -0800 Subject: [PATCH 04/18] make run script executable, bind mount /var/run/kubernetes, fix uid/gid --- Dockerfile | 4 ++-- config.json.template | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b10a8c..819e624 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=2 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=3 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ @@ -13,7 +13,7 @@ LABEL BZComponent="$NAME" \ COPY launch.sh /usr/bin/kube-apiserver-docker.sh -RUN chmod +x /usr/bin/kube-apiserver +RUN chmod +x /usr/bin/kube-apiserver* LABEL RUN /usr/bin/docker/ run -d --net=host -p 443:443 diff --git a/config.json.template b/config.json.template index 8a58c2a..ec6bae5 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-apiserver-docker.sh" @@ -155,6 +155,15 @@ "rbind", "rprivate" ] + }, + { + "destination": "/var/run/kubernetes", + "type": "bind", + "source": "/var/run/kubernetes", + "options": [ + "rw", + "rbind" + ] } ], "linux": { From 0e9ec51c17afd90e1dc8fafb2d5a9bdeb75fec52 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 27 Nov 2017 14:34:25 -0800 Subject: [PATCH 05/18] make launch script executable --- launch.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 launch.sh diff --git a/launch.sh b/launch.sh old mode 100644 new mode 100755 From 17f619e7e9673df4c809ea829c76548e066e792a Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 27 Nov 2017 17:40:38 -0800 Subject: [PATCH 06/18] bump release --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 819e624..0a80f35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=3 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=4 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From be6ff861594bc41eae6d40c4b293f03cb56ed519 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 28 Nov 2017 08:37:54 -0800 Subject: [PATCH 07/18] add tmpfiles.template --- Dockerfile | 2 +- tmpfiles.template | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 tmpfiles.template diff --git a/Dockerfile b/Dockerfile index 0a80f35..2a6e25a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=4 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=5 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ diff --git a/tmpfiles.template b/tmpfiles.template new file mode 100644 index 0000000..0fc3bdf --- /dev/null +++ b/tmpfiles.template @@ -0,0 +1 @@ +d /var/run/kubernetes 0755 kube kube - From 91c3b781ae99c59bb00b072b393376f9311d184c Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 28 Nov 2017 09:28:51 -0800 Subject: [PATCH 08/18] include tmpfiles.template in dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a6e25a..f7cca1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=5 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=6 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ @@ -17,7 +17,7 @@ RUN chmod +x /usr/bin/kube-apiserver* LABEL RUN /usr/bin/docker/ run -d --net=host -p 443:443 -COPY service.template config.json.template /exports/ +COPY service.template config.json.template tmpfiles.template /exports/ RUN mkdir -p /exports/hostfs/usr/local/bin/ && cp /usr/bin/kubectl /exports/hostfs/usr/local/bin/kubectl From 51b38c026272d1cd2b09f8c3b7f5dfb8a95ab1dd Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 28 Nov 2017 12:49:30 -0800 Subject: [PATCH 09/18] fix uid/gid, bind mount /var/run/kubernetes --- Dockerfile | 6 +++--- config.json.template | 13 +++++++++++-- launch.sh | 0 tmpfiles.template | 1 + 4 files changed, 15 insertions(+), 5 deletions(-) mode change 100644 => 100755 launch.sh create mode 100644 tmpfiles.template diff --git a/Dockerfile b/Dockerfile index b386efb..e3c35cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM candidate-registry.fedoraproject.org/f27/kubernetes-master:1.7.1 +FROM registry.fedoraproject.org/kubernetes-master:rawhide MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=1.7.1 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=0 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ @@ -17,7 +17,7 @@ RUN chmod +x /usr/bin/kube-apiserver LABEL RUN /usr/bin/docker/ run -d --net=host -p 443:443 -COPY service.template config.json.template /exports/ +COPY service.template config.json.template tmpfiles.template /exports/ RUN mkdir -p /exports/hostfs/usr/local/bin/ && cp /usr/bin/kubectl /exports/hostfs/usr/local/bin/kubectl diff --git a/config.json.template b/config.json.template index 8a58c2a..ec6bae5 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-apiserver-docker.sh" @@ -155,6 +155,15 @@ "rbind", "rprivate" ] + }, + { + "destination": "/var/run/kubernetes", + "type": "bind", + "source": "/var/run/kubernetes", + "options": [ + "rw", + "rbind" + ] } ], "linux": { diff --git a/launch.sh b/launch.sh old mode 100644 new mode 100755 diff --git a/tmpfiles.template b/tmpfiles.template new file mode 100644 index 0000000..0fc3bdf --- /dev/null +++ b/tmpfiles.template @@ -0,0 +1 @@ +d /var/run/kubernetes 0755 kube kube - From f7cdcaac7b87d8bb81b82d6ba346634ad12e46fa Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 10 Jan 2018 13:38:22 +0000 Subject: [PATCH 10/18] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7cca1c..9f94f62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=6 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=7 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 998d5559404077ac49ef3e514025917a79ef1899 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 17:10:52 +0000 Subject: [PATCH 11/18] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f94f62..11b218f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=7 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=8 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 4528dc13568ed37e602210b4009eea129de966ee Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 19:02:26 +0000 Subject: [PATCH 12/18] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 11b218f..08bee63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=9 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 09c8ac69424d2784a6c7aa81586dbc83d542e17b Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 15 Mar 2018 15:39:21 +0000 Subject: [PATCH 13/18] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 08bee63..65fc9a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=9 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=10 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 0c0e4c7dfd24062e56c52352471a71485df6085b Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 29 Mar 2018 14:44:35 +0000 Subject: [PATCH 14/18] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65fc9a4..173cd32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=10 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=11 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From c86f99cd94bc1f3a873efe6a636e3043d701cfc3 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 20 Apr 2018 14:44:00 +0000 Subject: [PATCH 15/18] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 173cd32..337b6d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=11 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=12 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From dfb9ddec65550ae406cbcfca5198960345c8e14b Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 16:01:50 +0000 Subject: [PATCH 16/18] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 337b6d7..85717c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=12 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=13 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 3d76e7856c2359c2fb10a9f4de4fe9db33e2560d Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 19:45:35 +0000 Subject: [PATCH 17/18] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 85717c8..a0b236b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=13 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=14 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 1c35a2501b0fbfa7c86fd7be09bb9e8e3e06b99e Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Tue, 21 Aug 2018 23:18:40 +0530 Subject: [PATCH 18/18] 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 e3c35cb..84d5631 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,10 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=0 ARCH=x86_64 +ENV NAME=kubernetes-apiserver VERSION=0 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ atomic.type='system'