Move same parts to common variables

There was a lot of repeated parts in this Makefile, I moved them to a common variable so that if / when we decide to change how things are run then it's easy to do so. Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> Upstream-commit: c869c9fcf510d1a6c4e25c1a14ea6cb0bb3e6aa4 Component: packaging
2018-03-15 23:31:46 +00:00
parent e5ebdf8a68
commit f925996d4a
1 changed files with 30 additions and 91 deletions
@@ -4,10 +4,21 @@ ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
 VERSION?=0.0.0-dev
-DEB_VERSION=$(shell ./gen-deb-ver $(ENGINE_DIR) $(VERSION))
+DEB_VERSION=$(shell ./gen-deb-ver $(ENGINE_DIR) "$(VERSION)")
 DOCKER_EXPERIMENTAL:=0
 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown

+BUILD=docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
+RUN=docker run --rm -i \
+	-e DEB_VERSION=$(DEB_VERSION) \
+	-e VERSION=$(VERSION) \
+	-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
+	-v $(CURDIR)/debbuild/$@:/build \
+	-v $(ENGINE_DIR):/engine \
+	-v $(CLI_DIR):/cli \
+	-v $(CURDIR)/systemd:/root/build-deb/systemd \
+	debbuild-$@/$(ARCH)
+
 .PHONY: help
 help: ## show make targets
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf " \033[36m%-20s\033[0m  %s\n", $$1, $$2}' $(MAKEFILE_LIST)
@@ -31,126 +42,54 @@ raspbian: raspbian-stretch debian-jessie ## build all raspbian deb packages

 .PHONY: ubuntu-xenial
 ubuntu-xenial: ## build ubuntu xenial deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@

 .PHONY: ubuntu-trusty
 ubuntu-trusty: ## build ubuntu trusty deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@

 .PHONY: ubuntu-artful
 ubuntu-artful: ## build ubuntu artful deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@

 .PHONY: debian-buster
 debian-buster: ## build debian buster deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@

 .PHONY: debian-jessie
 debian-jessie: ## build debian jessie deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@

 .PHONY: debian-stretch
 debian-stretch: ## build debian stretch deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@

 .PHONY: debian-wheezy
 debian-wheezy: ## build debian wheezy deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@

 .PHONY: raspbian-jessie
 raspbian-jessie: ## build raspbian jessie deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@

 .PHONY: raspbian-stretch
 raspbian-stretch: ## build raspbian stretch deb packages
-	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
-	docker run --rm -i \
-		-e DEB_VERSION=$(DEB_VERSION) \
-		-e VERSION=$(VERSION) \
-		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-		-v $(CURDIR)/debbuild/$@:/build \
-		-v $(ENGINE_DIR):/engine \
-		-v $(CLI_DIR):/cli \
-		-v $(CURDIR)/systemd:/root/build-deb/systemd \
-		debbuild-$@/$(ARCH)
+	$(BUILD)
+	$(RUN)
 	$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@