Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add quotes to echo, allow CONTAINER_BINARIES override #334

Merged
merged 1 commit into from
Jun 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PKG := k8s.io/ingress-gce

# List of binaries to build. You must have a matching Dockerfile.BINARY
# for each BINARY.
CONTAINER_BINARIES := \
CONTAINER_BINARIES ?= \
e2e-test \
echo \
fuzzer \
Expand Down
14 changes: 7 additions & 7 deletions build/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ $(GO_BINARIES): build-dirs
# Rules for dockerfiles.
define DOCKERFILE_RULE
.$(BINARY)-$(ARCH)-dockerfile: Dockerfile.$(BINARY)
@echo generating Dockerfile $$@ from $$<
@echo "generating Dockerfile $$@ from $$<"
@sed \
-e 's|ARG_ARCH|$(ARCH)|g' \
-e 's|ARG_BIN|$(BINARY)|g' \
Expand Down Expand Up @@ -233,7 +233,7 @@ endif
# Miscellaneous rules
.PHONY: version
version:
@echo $(VERSION)
@echo "$(VERSION)"

.PHONY: build-dirs
build-dirs:
Expand All @@ -254,20 +254,20 @@ bin-clean:
.PHONY: help
help:
@echo "make targets"
@echo
@echo ""
@echo " all, build build all binaries"
@echo " containers build the containers"
@echo " push push containers to the registry"
@echo " help this help message"
@echo " version show package version"
@echo
@echo ""
@echo " {build,containers,push}-ARCH do action for specific ARCH"
@echo " all-{build,containers,push} do action for all ARCH"
@echo " only-push-BINARY push just BINARY"
@echo
@echo ""
@echo " Available ARCH: $(ALL_ARCH)"
@echo " Available BINARIES: $(ALL_BINARIES)"
@echo
@echo ""
@echo " Setting VERBOSE=1 will show additional build logging."
@echo
@echo ""
@echo " Setting VERSION will override the container version tag."