diff --git a/Makefile b/Makefile index af113634ef..394586831e 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,8 @@ -SHELL:=/bin/bash -ENGINE_DIR:=$(CURDIR)/../engine -CLI_DIR:=$(CURDIR)/../cli -VERSION?=0.0.0-dev -DOCKER_GITCOMMIT:=abcdefg -ARCH=$(shell uname -m) -STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION)) -GO_VERSION:=1.12.8 -DEFAULT_PRODUCT_LICENSE:=Community Engine -PLATFORM=Docker Engine - Community -BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') -export DEFAULT_PRODUCT_LICENSE -export PLATFORM -export BUILDTIME +include common.mk + +CLI_DIR:=$(realpath $(CURDIR)/../cli) +ENGINE_DIR:=$(realpath $(CURDIR)/../engine) +STATIC_VERSION:=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION)) # Taken from: https://www.cmcrossroads.com/article/printing-value-makefile-variable print-% : ; @echo $($*) diff --git a/common.mk b/common.mk new file mode 100644 index 0000000000..abc222367b --- /dev/null +++ b/common.mk @@ -0,0 +1,12 @@ +ARCH=$(shell uname -m) +BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') +DEFAULT_PRODUCT_LICENSE:=Community Engine +DOCKER_GITCOMMIT:=abcdefg +GO_VERSION:=1.12.8 +PLATFORM=Docker Engine - Community +SHELL:=/bin/bash +VERSION?=0.0.0-dev + +export BUILDTIME +export DEFAULT_PRODUCT_LICENSE +export PLATFORM diff --git a/deb/Makefile b/deb/Makefile index 16c99e2612..315f1f31ef 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -1,12 +1,10 @@ -SHELL:=/bin/bash -ARCH:=$(shell uname -m) -CLI_DIR:=$(CURDIR)/../../cli -ENGINE_DIR:=$(CURDIR)/../../engine +include ../common.mk + +CLI_DIR:=$(realpath $(CURDIR)/../../cli) +ENGINE_DIR:=$(realpath $(CURDIR)/../../engine) GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD) -VERSION?=0.0.0-dev -STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) +STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_BASE_IMAGE=golang -GO_VERSION:=1.12.8 GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)") CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown diff --git a/image/Makefile b/image/Makefile index 9aff939f51..65142ead94 100644 --- a/image/Makefile +++ b/image/Makefile @@ -1,18 +1,13 @@ -SHELL:=/bin/bash -ENGINE_DIR:=$(CURDIR)/../../engine -CLI_DIR:=$(CURDIR)/../../cli -VERSION?=0.0.0-dev +include ../common.mk + +CLI_DIR:=$(realpath $(CURDIR)/../../cli) +ENGINE_DIR:=$(realpath $(CURDIR)/../../engine) GO_BASE_IMAGE=golang -GO_VERSION:=1.12.8 ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch -STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) +STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) DOCKER_HUB_ORG?=dockereng -ARCH=$(shell uname -m) ENGINE_IMAGE?=engine-community CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown -DEFAULT_PRODUCT_LICENSE?=Community Engine -PLATFORM?=Docker Engine - Community -BUILDTIME?=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') IMAGE_WITH_TAG=$(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION) ifdef BASE_IMAGE # TODO: Clean this up to only set ENGINE_GO_IMAGE diff --git a/rpm/Makefile b/rpm/Makefile index 4e2aef3e45..0ca87e7afc 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -1,11 +1,10 @@ -ARCH=$(shell uname -m) -ENGINE_DIR:=$(CURDIR)/../../engine -CLI_DIR:=$(CURDIR)/../../cli +include ../common.mk + +CLI_DIR:=$(realpath $(CURDIR)/../../cli) +ENGINE_DIR:=$(realpath $(CURDIR)/../../engine) GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) -VERSION?=0.0.0-dev -STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) +STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_BASE_IMAGE=golang -GO_VERSION:=1.12.8 GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown diff --git a/static/Makefile b/static/Makefile index af931b660c..54416ad0c9 100644 --- a/static/Makefile +++ b/static/Makefile @@ -1,12 +1,11 @@ -SHELL:=/bin/bash -ENGINE_DIR:=$(CURDIR)/../../engine -CLI_DIR:=$(CURDIR)/../../cli -VERSION?=0.0.0-dev -STATIC_VERSION=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION)) +include ../common.mk + +CLI_DIR:=$(realpath $(CURDIR)/../../cli) +ENGINE_DIR:=$(realpath $(CURDIR)/../../engine) +STATIC_VERSION:=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION)) CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files DIR_TO_HASH:=build/linux -DEFAULT_PRODUCT_LICENSE?=Community Engine GO_VERSION=$(shell grep "ARG GO_VERSION" $(CLI_DIR)/dockerfiles/Dockerfile.dev | awk -F'=' '{print $$2}') DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION)