Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 55378e4

Browse files
committed
Makefile: set STATIC_VERSION only if empty
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3b8cc28) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 7789c00ded52ad38392bee2369dfc0d7328ea957 Component: packaging
1 parent 97c70b0 commit 55378e4

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

components/packaging/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../cli
44
VERSION?=0.0.0-dev
55
DOCKER_GITCOMMIT:=abcdefg
66
ARCH=$(shell uname -m)
7-
STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
7+
STATIC_VERSION:=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
88
GO_VERSION:=1.12.8
99
DEFAULT_PRODUCT_LICENSE:=Community Engine
1010
PLATFORM=Docker Engine - Community

components/packaging/deb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../../cli
44
ENGINE_DIR:=$(CURDIR)/../../engine
55
GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
66
VERSION?=0.0.0-dev
7-
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
7+
STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
88
GO_BASE_IMAGE=golang
99
GO_VERSION:=1.12.8
1010
GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch

components/packaging/image/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VERSION?=0.0.0-dev
55
GO_BASE_IMAGE=golang
66
GO_VERSION:=1.12.8
77
ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
8-
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
8+
STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
99
DOCKER_HUB_ORG?=dockereng
1010
ARCH=$(shell uname -m)
1111
ENGINE_IMAGE?=engine-community

components/packaging/rpm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ENGINE_DIR:=$(CURDIR)/../../engine
33
CLI_DIR:=$(CURDIR)/../../cli
44
GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
55
VERSION?=0.0.0-dev
6-
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
6+
STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
77
GO_BASE_IMAGE=golang
88
GO_VERSION:=1.12.8
99
GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch

components/packaging/static/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SHELL:=/bin/bash
22
ENGINE_DIR:=$(CURDIR)/../../engine
33
CLI_DIR:=$(CURDIR)/../../cli
44
VERSION?=0.0.0-dev
5-
STATIC_VERSION=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION))
5+
STATIC_VERSION:=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION))
66
CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown
77
HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
88
DIR_TO_HASH:=build/linux

0 commit comments

Comments
 (0)