Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Bhavin Gandhi
1c35a2501b 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 <bhavin7392@gmail.com>
2018-08-21 23:18:40 +05:30
Jason Brooks
51b38c0262 fix uid/gid, bind mount /var/run/kubernetes 2017-11-28 12:49:30 -08:00
4 changed files with 15 additions and 6 deletions

View file

@ -1,13 +1,12 @@
FROM candidate-registry.fedoraproject.org/f27/kubernetes-master:1.7.1
FROM registry.fedoraproject.org/kubernetes-master:rawhide
MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
ENV container=docker
ENV NAME=kubernetes-apiserver VERSION=1.7.1 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'
@ -17,7 +16,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

View file

@ -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": {

0
launch.sh Normal file → Executable file
View file

1
tmpfiles.template Normal file
View file

@ -0,0 +1 @@
d /var/run/kubernetes 0755 kube kube -