Commit 50c86b43 authored by Yuanle Song's avatar Yuanle Song
Browse files

v1.9.4 quote a few more variables in Makefile

parent a706dd05
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
(defproject python/lein-template "1.9.3"
(defproject python/lein-template "1.9.4"
  :description "lein template for a python project"
  :url "https://gitlab.emacsos.com/sylecn/python-project-template"
  :license {:name "Apache License 2.0"
+3 −3
Original line number Diff line number Diff line
@@ -99,14 +99,14 @@ just-test:
# run test, build deb in python build image container, then create docker
# image and push image on host.
ci-build:
	echo '$(value DOCKER_PASSWORD)' | docker login -u $(DOCKER_USER) --password-stdin $(BUILD_DOCKER_IMAGE)
	echo '$(value DOCKER_PASSWORD)' | docker login -u '$(DOCKER_USER)' --password-stdin '$(BUILD_DOCKER_IMAGE)'
	mkdir -p .cache
	docker run --rm --name {{ name }}-test -v "$(CURDIR)":/app -v "$(CURDIR)/.cache":/.cache -u $(shell id -u):$(shell id -g) $(BUILD_DOCKER_IMAGE) make test deb -C /app
	docker run --rm --name {{ name }}-test -v "$(CURDIR)":/app -v "$(CURDIR)/.cache":/.cache -u $(shell id -u):$(shell id -g) -e CI_BUILD=1 '$(BUILD_DOCKER_IMAGE)' make test deb -C /app
	docker build -t $(DOCKER_IMAGE_PREFIX)/{{ name }}:$(VERSION) .
	docker push $(DOCKER_IMAGE_PREFIX)/{{ name }}:$(VERSION)
deploy:
	sed "s/IMAGE_TAG/$(VERSION)/" app.yaml > $(VERSION).yaml
	kubectl --certificate-authority='$(KUBECTL_CA_PATH)' -s $(KUBECTL_API) --token=$(KUBECTL_TOKEN) apply -f $(VERSION).yaml
	kubectl --certificate-authority='$(KUBECTL_CA_PATH)' -s '$(KUBECTL_API)' --token='$(KUBECTL_TOKEN)' apply -f $(VERSION).yaml

test-prod: requirements-dev test