Merge pull request kubernetes#1 from brancz/openshift-origin-base

Rebase container image on openshift/origin-base

.dockerignore

@@ -1,2 +1 @@
-*
-!kube-state-metrics
+kube-state-metrics

Dockerfile

@@ -1,9 +1,21 @@
-FROM scratch
+FROM openshift/origin-base
 
-COPY kube-state-metrics /
-VOLUME /tmp
+ENV GOPATH /go
+RUN mkdir $GOPATH
 
-ENTRYPOINT ["/kube-state-metrics", "--port=8080", "--telemetry-port=8081"]
+COPY . $GOPATH/src/k8s.io/kube-state-metrics
 
-EXPOSE 8080
-EXPOSE 8081
+RUN yum install -y golang make git && \
+   cd $GOPATH/src/k8s.io/kube-state-metrics && cat Makefile && \
+   make build && cp $GOPATH/src/k8s.io/kube-state-metrics/kube-state-metrics /usr/bin/ && \
+   yum erase -y golang make && yum clean all
+
+LABEL io.k8s.display-name="kube-state-metrics" \
+      io.k8s.description="This is a component that exposes metrics about Kubernetes objects." \
+      io.openshift.tags="kubernetes" \
+      maintainer="Frederic Branczyk <fbranczy@redhat.com>"
+
+# doesn't require a root user.
+USER 1001
+
+ENTRYPOINT ["/usr/bin/kube-state-metrics"]

Makefile

@@ -28,7 +28,7 @@ doccheck:
 	@echo OK
 
 build: clean
-	docker run --rm -v "$$PWD":/go/src/k8s.io/kube-state-metrics -w /go/src/k8s.io/kube-state-metrics -e GOOS=$(shell uname -s | tr A-Z a-z) -e GOARCH=$(ARCH) -e CGO_ENABLED=0 golang:${GO_VERSION} go build -ldflags "-s -w -X ${PKG}/version.Release=${TAG} -X ${PKG}/version.Commit=${Commit} -X ${PKG}/version.BuildDate=${BuildDate}" -o kube-state-metrics
+	GOOS=$(shell uname -s | tr A-Z a-z) GOARCH=$(ARCH) CGO_ENABLED=0 go build -ldflags "-s -w -X ${PKG}/version.Release=${TAG} -X ${PKG}/version.Commit=${Commit} -X ${PKG}/version.BuildDate=${BuildDate}" -o kube-state-metrics
 
 test-unit: clean build
 	GOOS=$(shell uname -s | tr A-Z a-z) GOARCH=$(ARCH) $(TESTENVVAR) go test --race $(FLAGS) $(PKGS)