From d43c1b523f35bd037a9135faf79ce1666f3dd75a Mon Sep 17 00:00:00 2001
From: Jakub Matys <jakub.matys@satoshilabs.com>
Date: Tue, 12 Jun 2018 13:35:13 +0200
Subject: [PATCH] Added ARGS variable to pass arguments to go/dpkg-buildpackage
 commands

---
 Makefile               | 13 +++++++------
 build/bin/Makefile     |  9 +++++----
 build/deb/Dockerfile   |  2 --
 build/deb/build-deb.sh |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index e7ec249a..0b08c286 100644
--- a/Makefile
+++ b/Makefile
@@ -3,26 +3,27 @@ DEB_IMAGE = blockbook-build-deb
 PACKAGER = $(shell id -u):$(shell id -g)
 NO_CACHE = false
 UPDATE_VENDOR = 1
+ARGS ?=
 
 .PHONY: build build-debug test deb
 
 build: .bin-image
-	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(BIN_IMAGE) make build
+	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(BIN_IMAGE) make build ARGS="$(ARGS)"
 
 build-debug: .bin-image
-	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(BIN_IMAGE) make build-debug
+	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(BIN_IMAGE) make build-debug ARGS="$(ARGS)"
 
 test: .bin-image
-	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src $(BIN_IMAGE) make test
+	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src $(BIN_IMAGE) make test ARGS="$(ARGS)"
 
 test-all: .bin-image
-	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src $(BIN_IMAGE) make test-all
+	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src $(BIN_IMAGE) make test-all ARGS="$(ARGS)"
 
 deb: .deb-image clean-deb
-	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(DEB_IMAGE)
+	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(DEB_IMAGE) /build/build-deb.sh $(ARGS)
 
 tools:
-	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(BIN_IMAGE) make tools
+	docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(BIN_IMAGE) make tools ARGS="$(ARGS)"
 
 all: build-images deb
 
diff --git a/build/bin/Makefile b/build/bin/Makefile
index 0c2e5ec0..635cb047 100644
--- a/build/bin/Makefile
+++ b/build/bin/Makefile
@@ -4,16 +4,17 @@ VERSION ?= devel
 GITCOMMIT = $(shell cd /src && git describe --tags --always --dirty)
 BUILDTIME = $(shell date --iso-8601=seconds)
 LDFLAGS := -X blockbook/common.version=$(VERSION) -X blockbook/common.gitcommit=$(GITCOMMIT) -X blockbook/common.buildtime=$(BUILDTIME)
+ARGS ?=
 
 all: build tools
 
 build: prepare-sources
-	cd $(GOPATH)/src/blockbook && go build -o $(CURDIR)/blockbook -ldflags="-s -w $(LDFLAGS)"
+	cd $(GOPATH)/src/blockbook && go build -o $(CURDIR)/blockbook -ldflags="-s -w $(LDFLAGS)" $(ARGS)
 	cp $(CURDIR)/blockbook /out/blockbook
 	chown $(PACKAGER) /out/blockbook
 
 build-debug: prepare-sources
-	cd $(GOPATH)/src/blockbook && go build -o $(CURDIR)/blockbook -ldflags="$(LDFLAGS)"
+	cd $(GOPATH)/src/blockbook && go build -o $(CURDIR)/blockbook -ldflags="$(LDFLAGS)" $(ARGS)
 	cp $(CURDIR)/blockbook /out/blockbook
 	chown $(PACKAGER) /out/blockbook
 
@@ -22,10 +23,10 @@ tools:
 	chown $(PACKAGER) /out/{ldb,sst_dump}
 
 test: prepare-sources
-	cd $(GOPATH)/src/blockbook && go test -short ./...
+	cd $(GOPATH)/src/blockbook && go test -short ./... $(ARGS)
 
 test-all: prepare-sources
-	cd $(GOPATH)/src/blockbook && go test ./...
+	cd $(GOPATH)/src/blockbook && go test ./... $(ARGS)
 
 prepare-sources:
 	@ [ -n "`ls /src 2> /dev/null`" ] || (echo "/src doesn't exist or is empty" 1>&2 && exit 1)
diff --git a/build/deb/Dockerfile b/build/deb/Dockerfile
index df454131..c924f02f 100644
--- a/build/deb/Dockerfile
+++ b/build/deb/Dockerfile
@@ -11,5 +11,3 @@ ADD build-deb.sh /build/build-deb.sh
 ADD logrotate.sh /build/logrotate.sh
 
 WORKDIR /build
-
-CMD /build/build-deb.sh
diff --git a/build/deb/build-deb.sh b/build/deb/build-deb.sh
index 368060b6..f39e48d1 100755
--- a/build/deb/build-deb.sh
+++ b/build/deb/build-deb.sh
@@ -8,6 +8,6 @@ mkdir cert && cp /src/server/testcert.* cert
 
 export VERSION=$(dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)([-+~].+)?$/\1/p')
 
-dpkg-buildpackage -us -uc
+dpkg-buildpackage -us -uc $@
 mv ../*.deb /out
 chown $PACKAGER /out/*.deb