Compare commits

..

6 commits

Author SHA1 Message Date
Adam Miller
249b6aa78d Bump RELEASE for automatic rebuild 2017-11-14 16:42:55 -06:00
Adam Miller
3dc8bff861 Bump RELEASE for automatic rebuild 2017-09-21 15:06:35 -05:00
Jason Brooks
19b57ba82a fix uid/gid 2017-09-05 11:11:22 -07:00
Adam Miller
c31d52d28c Bump RELEASE for automatic rebuild 2017-08-24 18:01:51 -05:00
Jason Brooks
4ff605b1c1 make init script executable 2017-08-16 18:31:39 -07:00
Jason Brooks
6609d3338d import from rawhide 2017-07-07 09:46:21 -07:00
2 changed files with 4 additions and 3 deletions

View file

@ -1,12 +1,13 @@
FROM registry.fedoraproject.org/kubernetes-master:rawhide
FROM registry.fedoraproject.org/f26/kubernetes-master:latest
MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
ENV container=docker
ENV NAME=kubernetes-controller-manager VERSION=0 ARCH=x86_64
ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=5 ARCH=x86_64
LABEL BZComponent="$NAME" \
name="$FGC/$NAME" \
version="$VERSION" \
release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \
atomic.type='system'

View file

@ -3,6 +3,6 @@
source /etc/kubernetes/controller-manager
source /etc/kubernetes/config
ARGS="$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_CONTROLLER_MANAGER_ARGS"
ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_CONTROLLER_MANAGER_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs)
exec /usr/bin/kube-controller-manager $ARGS