From 91305360976131f79b16732f95cbe182595bd363 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Fri, 22 Dec 2017 16:05:42 +0100
Subject: [PATCH] *: Add kube-prometheus generate make target to generate stage
---
Dockerfile | 6 ------
Makefile | 12 ++++++------
2 files changed, 6 insertions(+), 12 deletions(-)
delete mode 100644 Dockerfile
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 78032788..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM python:3.6-slim
-
-RUN apt-get update -y && apt-get install -y git
-RUN pip3 install virtualenv
-
-ENTRYPOINT ["/bin/bash"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index a093ce7a..26084ae4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
.PHONY: image
-
-IMAGE := coreos/generate-prometheus-operator-manifests
-image: Dockerfile
- docker build -t $(IMAGE) .
+image:
+ docker build -f ../../scripts/jsonnet/Dockerfile -t po-jsonnet ../../
-BUILDER := docker run --rm -it --workdir /data -v ${PWD}:/data $(IMAGE) ./hack/scripts/generate-manifests.sh
generate: image
@echo ">> Compiling assets and generating Kubernetes manifests"
- $(BUILDER)
+ docker run --rm -v `pwd`:/go/src/github.com/coreos/prometheus-operator/contrib/kube-prometheus --workdir /go/src/github.com/coreos/prometheus-operator/contrib/kube-prometheus po-jsonnet make generate-raw
+
+generate-raw:
+ ./hack/scripts/generate-manifests.sh
--
GitLab