Merge pull request #398 from k82cn/automated-cherry-pick-of-#396-#397-…

…release-0.2 Automated cherry pick of #396: Fixed build images error. #397: Fix build error.
kubernetes-retired · Oct 11, 2018 · 41cb7da · 41cb7da
2 parents e0e5212 + d7dc594
commit 41cb7da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -17,9 +17,9 @@ generate-code:
 	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/scheduling/v1alpha1/ -O zz_generated.deepcopy
 
 images: kube-batch
-	cp ./_output/bin/kube-batch ./deployment/
-	docker build ./deployment/ -f ./deployment/Dockerfile -t kubesigs/kube-batch:${RELEASE_VER}
-	rm -f ./deployment/kube-batch
+	cp ./_output/bin/kube-batch ./deployment/images/
+	docker build ./deployment/images -t kubesigs/kube-batch:${RELEASE_VER}
+	rm -f ./deployment/images/kube-batch
 
 run-test:
 	hack/make-rules/test.sh $(WHAT) $(TESTS)

diff --git a/deployment/Dockerfile → deployment/images/Dockerfile b/deployment/Dockerfile → deployment/images/Dockerfile