diff --git a/Dockerfile b/Dockerfile index 837aaf7..6d2da8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ -FROM registry.fedoraproject.org/kubernetes-master:rawhide +FROM registry.fedoraproject.org/f26/kubernetes-node:latest MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-proxy VERSION=0 ARCH=x86_64 +ENV NAME=kubernetes-proxy VERSION=0 RELEASE=5 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ + release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ atomic.type='system' diff --git a/config.json.template b/config.json.template index 3400a6b..a4d7a0c 100644 --- a/config.json.template +++ b/config.json.template @@ -7,8 +7,8 @@ "process": { "terminal": false, "user": { - "uid": 0, - "gid": 0 + "uid": 996, + "gid": 994 }, "args": [ "/usr/bin/kube-proxy-docker.sh" @@ -320,16 +320,6 @@ "rbind", "rprivate" ] - }, - { - "type": "bind", - "source": "/run", - "destination": "/run", - "options": [ - "rbind", - "rw", - "mode=755" - ] } ], "linux": { diff --git a/launch.sh b/launch.sh index 2906497..5318c6b 100755 --- a/launch.sh +++ b/launch.sh @@ -3,6 +3,6 @@ source /etc/kubernetes/proxy source /etc/kubernetes/config -ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_PROXY_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs) +ARGS="$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_PROXY_ARGS" exec /usr/bin/kube-proxy $ARGS