Merge pull request #35 from nginxinc/makefile-parameterization

Add support for Makefile parameterisation

Author: martialonline

Makefile

@@ -1,5 +1,8 @@
 NGINX_PLUS_VERSION=19-1
 NGINX_IMAGE=nginxplus:$(NGINX_PLUS_VERSION)
+DOCKER_NETWORK?=test
+DOCKER_NGINX_PLUS?=nginx-plus
+DOCKER_NGINX_PLUS_HELPER?=nginx-plus-helper
 
 test: docker-build run-nginx-plus test-run configure-no-stream-block test-run-no-stream-block clean
 
@@ -10,24 +13,24 @@ docker-build:
 	docker build --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION)~stretch -t $(NGINX_IMAGE) docker
 
 run-nginx-plus:
-	docker network create --driver bridge test
-	docker run --network=test -d --name nginx-plus --network-alias=nginx-plus-test --rm -p 8080:8080 -p 8081:8081 $(NGINX_IMAGE)
-	docker run --network=test -d --name nginx-plus-helper --network-alias=nginx-plus-test --rm -p 8090:8080 -p 8091:8081 $(NGINX_IMAGE)
+	docker network create --driver bridge $(DOCKER_NETWORK)
+	docker run --network=$(DOCKER_NETWORK) -d --name $(DOCKER_NGINX_PLUS) --network-alias=nginx-plus-test --rm -p 8080:8080 -p 8081:8081 $(NGINX_IMAGE)
+	docker run --network=$(DOCKER_NETWORK) -d --name $(DOCKER_NGINX_PLUS_HELPER) --network-alias=nginx-plus-test --rm -p 8090:8080 -p 8091:8081 $(NGINX_IMAGE)
 
 test-run:
 	go test client/*
 	go clean -testcache
-	go test tests/client_test.go 
+	go test tests/client_test.go
 
 configure-no-stream-block:
-	docker cp docker/nginx_no_stream.conf nginx-plus:/etc/nginx/nginx.conf
-	docker exec nginx-plus nginx -s reload
+	docker cp docker/nginx_no_stream.conf $(DOCKER_NGINX_PLUS):/etc/nginx/nginx.conf
+	docker exec $(DOCKER_NGINX_PLUS) nginx -s reload
 
 test-run-no-stream-block:
 	go clean -testcache
 	go test tests/client_no_stream_test.go
 
 clean:
-	-docker kill nginx-plus
-	-docker kill nginx-plus-helper
-	-docker network rm test
+	-docker kill $(DOCKER_NGINX_PLUS)
+	-docker kill $(DOCKER_NGINX_PLUS_HELPER)
+	-docker network rm $(DOCKER_NETWORK)