Skip to content

Commit

Permalink
Merge pull request #16 from chaitanyaenr/fix_makefile
Browse files Browse the repository at this point in the history
Replace spaces with tab to avoid Makefile syntax failure
  • Loading branch information
asobti authored Oct 19, 2017
2 parents 95fc29e + cb5e0da commit f264535
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ build: clean
# Supressing docker build avoids printing the env variables
container: build
ifneq ($(and $(http_proxy), $(https_proxy)),)
@echo Starting Docker build, importing both http_proxy and https_proxy env variables
@docker build --build-arg http_proxy=$(http_proxy) --build-arg https_proxy=$(https_proxy) -t kube-monkey:$(TAG) .
@echo Starting Docker build, importing both http_proxy and https_proxy env variables
@docker build --build-arg http_proxy=$(http_proxy) --build-arg https_proxy=$(https_proxy) -t kube-monkey:$(TAG) .
else
ifdef http_proxy
@echo Starting Docker build, importing http_proxy
@docker build --build-arg http_proxy=$(http_proxy) -t kube-monkey:$(TAG) .
@echo Starting Docker build, importing http_proxy
@docker build --build-arg http_proxy=$(http_proxy) -t kube-monkey:$(TAG) .
else
ifdef https_proxy
@echo Starting Docker build, importing https_proxy
@docker build --build-arg https_proxy=$(https_proxy) -t kube-monkey:$(TAG) .
@echo Starting Docker build, importing https_proxy
@docker build --build-arg https_proxy=$(https_proxy) -t kube-monkey:$(TAG) .
else
@echo no env proxies set, building normally
docker build -t kube-monkey:$(TAG) .
@echo no env proxies set, building normally
docker build -t kube-monkey:$(TAG) .
endif
endif
endif
Expand Down

0 comments on commit f264535

Please sign in to comment.