@@ -13,9 +13,7 @@ DEIS_REGISTRY ?= ${DEV_REGISTRY}
1313
1414IMAGE_PREFIX ?= deis
1515
16- # Kubernetes-specific information for RC, Service, and Image.
17- RC := contrib/kubernetes/manifests/${SHORT_NAME}-rc.tmp.yaml
18- SVC := contrib/kubernetes/manifests/${SHORT_NAME}-service.yaml
16+ # Canonical docker image name
1917IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
2018
2119all :
@@ -33,26 +31,7 @@ docker-build: check-docker
3331docker-push : check-docker check-registry
3432 docker push ${IMAGE}
3533
36- # Deploy is a Kubernetes-oriented target
37- deploy : kube-service kube-rc
38-
39- # Some things, like services, have to be deployed before pods. This is an
40- # example target. Others could perhaps include kube-secret, kube-volume, etc.
41- kube-service : check-kubectl
42- kubectl create -f ${SVC}
43-
44- # When possible, we deploy with RCs.
45- kube-rc : check-kubectl
46- kubectl create -f ${RC}
47-
48- kube-clean : check-kubectl
49- kubectl delete rc ${SHORT_NAME}
50-
5134test : check-docker
5235 contrib/ci/test.sh ${IMAGE}
5336
54- update-manifests :
55- sed ' s#\(image:\) .*#\1 $(IMAGE)#' contrib/kubernetes/manifests/${SHORT_NAME} -rc.yaml \
56- > ${RC}
57-
58- .PHONY : all build kube-up kube-down deploy
37+ .PHONY : all build deploy
0 commit comments