Fix make docker target

This commit is contained in:
Carlos de Paula 2020-06-22 19:29:51 -03:00
parent 5c772218d9
commit c2e91b0ea9

View File

@ -18,53 +18,53 @@ manifests: $(JSONNET_BIN) ## Builds the manifests
rm -rf manifests rm -rf manifests
./scripts/build.sh main.jsonnet $(JSONNET_BIN) ./scripts/build.sh main.jsonnet $(JSONNET_BIN)
docker: ## Builds the manifests in a Docker container to avoid installing pre-requisites (Golang, Jsonnet, etc) docker: ## Builds the manifests in a Docker container to avoid installing pre-requisites (Golang, Jsonnet, etc)
docker run -it --rm -v $(PWD):/work -w /work --rm golang make vendor && make docker run -it --rm -v $(PWD):/work -w /work --rm golang bash -c "make vendor && make"
update_libs: $(JB_BINARY) ## Updates vendor libs. Require a regeneration of the manifests update_libs: $(JB_BINARY) ## Updates vendor libs. Require a regeneration of the manifests
$(JB_BINARY) update $(JB_BINARY) update
vendor: $(JB_BINARY) jsonnetfile.json jsonnetfile.lock.json ## Download vendor libs vendor: $(JB_BINARY) jsonnetfile.json jsonnetfile.lock.json ## Download vendor libs
rm -rf vendor rm -rf vendor
$(JB_BINARY) install $(JB_BINARY) install
fmt: ## Formats all jsonnet and libsonnet files (except on vendor dir) fmt: ## Formats all jsonnet and libsonnet files (except on vendor dir)
@echo "Formatting jsonnet files" @echo "Formatting jsonnet files"
@find . -type f \( -iname "*.libsonnet" -or -iname "*.jsonnet" \) -print -or -name "vendor" -prune | xargs -n 1 -- $(JSONNET_FMT) -i @find . -type f \( -iname "*.libsonnet" -or -iname "*.jsonnet" \) -print -or -name "vendor" -prune | xargs -n 1 -- $(JSONNET_FMT) -i
deploy: ## Deploy current manifests to configured cluster deploy: ## Deploy current manifests to configured cluster
echo "Deploying stack setup manifests..." echo "Deploying stack setup manifests..."
kubectl apply -f ./manifests/setup/ kubectl apply -f ./manifests/setup/
echo "Will wait 10 seconds to deploy the additional manifests.." echo "Will wait 10 seconds to deploy the additional manifests.."
sleep 10 sleep 10
kubectl apply -f ./manifests/ kubectl apply -f ./manifests/
teardown: ## Delete all monitoring stack resources from configured cluster teardown: ## Delete all monitoring stack resources from configured cluster
kubectl delete -f ./manifests/ kubectl delete -f ./manifests/
kubectl delete -f ./manifests/setup/ kubectl delete -f ./manifests/setup/
tar: manifests ## Generates a .tar.gz from manifests dir tar: manifests ## Generates a .tar.gz from manifests dir
rm -rf manifests.tar.gz rm -rf manifests.tar.gz
tar -cfz manifests.tar.gz manifests tar -cfz manifests.tar.gz manifests
$(JB_BINARY): ## Installs jsonnet-bundler utility $(JB_BINARY): ## Installs jsonnet-bundler utility
@echo "Installing jsonnet-bundler" @echo "Installing jsonnet-bundler"
@go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb @go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
$(JSONNET_BIN): ## Installs jsonnet and jsonnetfmt utility $(JSONNET_BIN): ## Installs jsonnet and jsonnetfmt utility
@echo "Installing jsonnet" @echo "Installing jsonnet"
@go get -u github.com/google/go-jsonnet/cmd/jsonnet @go get -u github.com/google/go-jsonnet/cmd/jsonnet
@go get -u github.com/google/go-jsonnet/cmd/jsonnetfmt @go get -u github.com/google/go-jsonnet/cmd/jsonnetfmt
@go get -u github.com/brancz/gojsontoyaml @go get -u github.com/brancz/gojsontoyaml
update_tools: ## Updates jsonnet, jsonnetfmt and jb utilities update_tools: ## Updates jsonnet, jsonnetfmt and jb utilities
@echo "Updating jsonnet" @echo "Updating jsonnet"
@go get -u github.com/google/go-jsonnet/cmd/jsonnet @go get -u github.com/google/go-jsonnet/cmd/jsonnet
@go get -u github.com/google/go-jsonnet/cmd/jsonnetfmt @go get -u github.com/google/go-jsonnet/cmd/jsonnetfmt
@go get -u github.com/brancz/gojsontoyaml @go get -u github.com/brancz/gojsontoyaml
@go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb @go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
change_suffix: ## Changes suffix for the ingress. Pass suffix=[suffixURL] as argument change_suffix: ## Changes suffix for the ingress. Pass suffix=[suffixURL] as argument
@echo "Ingress IPs changed to [service].${suffix}" @echo "Ingress IPs changed to [service].${suffix}"
@echo "Apply to your cluster with:" @echo "Apply to your cluster with:"
@for f in alertmanager prometheus grafana; do \ @for f in alertmanager prometheus grafana; do \