From 3b8cc28c3f75526bcd4875ec8772d8655406e8e2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 14 Aug 2019 23:27:03 +0200 Subject: [PATCH] Makefile: set STATIC_VERSION only if empty Signed-off-by: Sebastiaan van Stijn --- Makefile | 2 +- deb/Makefile | 2 +- image/Makefile | 2 +- rpm/Makefile | 2 +- static/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index af113634ef..bef0aab702 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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)) +STATIC_VERSION:=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_VERSION:=1.12.8 DEFAULT_PRODUCT_LICENSE:=Community Engine PLATFORM=Docker Engine - Community diff --git a/deb/Makefile b/deb/Makefile index 16c99e2612..ee48d899d8 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../../cli ENGINE_DIR:=$(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 diff --git a/image/Makefile b/image/Makefile index 9aff939f51..52a4f9b8b3 100644 --- a/image/Makefile +++ b/image/Makefile @@ -5,7 +5,7 @@ VERSION?=0.0.0-dev 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 diff --git a/rpm/Makefile b/rpm/Makefile index 4e2aef3e45..296631c7f0 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -3,7 +3,7 @@ ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli 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 diff --git a/static/Makefile b/static/Makefile index af931b660c..fe0851f2bc 100644 --- a/static/Makefile +++ b/static/Makefile @@ -2,7 +2,7 @@ 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)) +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