diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 780327889b51bb60b76cc637a953c131928c14c4..0000000000000000000000000000000000000000 --- 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 a093ce7aa71d3356fb874c1365e5f67c7fdf98f3..26084ae48d95a219f8f0ba824f8ca93db6192b69 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