Defaults Makefile VERSION variable to 0.0.0-dev (docker-archive#67)

When building we should default to a dummy version unless otherwise specified so we don't get ourselves confused over what is official and what is not. Signed-off-by: Eli Uriegas <[email protected]> (cherry picked from commit ffcd040) Signed-off-by: Eli Uriegas <[email protected]>
silvin-lubecki · Dec 7, 2017 · a724e75 · a724e75
1 parent 994c915
commit a724e75
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SHELL:=/bin/bash
 ENGINE_DIR:=$(CURDIR)/../engine
 CLI_DIR:=$(CURDIR)/../cli
-VERSION=unknown
+VERSION?=0.0.0-dev
 DOCKER_GITCOMMIT:=abcdefg
 
 .PHONY: help clean rpm deb static

diff --git a/deb/Makefile b/deb/Makefile
@@ -3,7 +3,7 @@ ARCH:=$(shell uname -m)
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
-VERSION?=$(shell cat $(ENGINE_DIR)/VERSION)
+VERSION?=0.0.0-dev
 DOCKER_EXPERIMENTAL:=0
 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 

diff --git a/rpm/Makefile b/rpm/Makefile
@@ -2,7 +2,7 @@ ARCH=$(shell uname -m)
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
-VERSION=$(shell cat $(ENGINE_DIR)/VERSION)
+VERSION?=0.0.0-dev
 DOCKER_EXPERIMENTAL=0
 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION))
 CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown

diff --git a/static/Makefile b/static/Makefile
@@ -1,7 +1,7 @@
 SHELL:=/bin/bash
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
-VERSION=$(shell cat $(ENGINE_DIR)/VERSION)
+VERSION?=0.0.0-dev
 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