Merge commit '89f3a0eca96bbd877b466212f6ee27794f149458' into fix-makefiles

.makefiles/base.mk

@@ -2,18 +2,16 @@ export
 NAME ?= $(shell basename $(CURDIR))
 VERSION ?= $(shell git describe --tags --dirty 2>/dev/null)
 
+ifeq ($(VERSION),)
+	VERSION:=unknown
+endif
+
 # Get the location of this makefile.
 MK_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 -include .env
 -include ../.env
 
-.FORCE:
-
-version: .FORCE
-	@echo $(VERSION) > $(NAME)/VERSION
-	@echo $(VERSION)
-
 help:           ## Show this help.
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/\(.*:\)[^#]*##\s*\(.*\)/\1\t\2/' | column -t -s "	"
 
@@ -35,4 +33,4 @@ include $(MK_DIR)/git.mk
 info:: ## List all variables
 	env
 
-.PHONY:: config help ci version .FORCE
+.PHONY:: config help ci

.makefiles/docker.mk

@@ -1,4 +1,5 @@
-IMAGEWTAG ?= $(IMAGENAME):$(VERSION)
+IMAGENAME?=$(NAME)
+IMAGEWTAG?=$(IMAGENAME):$(VERSION)
 
 docker-login: ## Log in to the registry. It will only be used in the server, or when running a CI task locally (if CI_BUILD_TOKEN is set).
 ifeq ($(CI_BUILD_TOKEN),)
@@ -22,4 +23,7 @@ login:: docker-login
 
 clean:: docker-clean
 
+docker-info:
+	@echo IMAGEWTAG=${IMAGEWTAG}
+
 .PHONY:: docker-login docker-clean login clean

.makefiles/python.mk

@@ -1,9 +1,17 @@
-PYVERSIONS ?= 2.7
+PYVERSIONS ?= 3.5
 PYMAIN ?= $(firstword $(PYVERSIONS))
 TARNAME ?= $(NAME)-$(VERSION).tar.gz 
+VERSIONFILE ?= $(NAME)/VERSION
 
 DEVPORT ?= 6000
 
+
+.FORCE:
+
+version: .FORCE
+	@echo $(VERSION) > $(VERSIONFILE)
+	@echo $(VERSION)
+
 yapf: ## Format python code
 	yapf -i -r $(NAME)
 	yapf -i -r tests
@@ -89,4 +97,4 @@ clean:: ## Clean older docker images and containers related to this project and
 	@docker ps -a | grep $(IMAGENAME) | awk '{ split($$2, vers, "-"); if(vers[0] != "${VERSION}"){ print $$1;}}' | xargs docker rm -v 2>/dev/null|| true
 	@docker images | grep $(IMAGENAME) | awk '{ split($$2, vers, "-"); if(vers[0] != "${VERSION}"){ print $$1":"$$2;}}' | xargs docker rmi 2>/dev/null|| true
 
-.PHONY:: yapf dockerfiles Dockerfile-% quick_build build build-% dev-% quick-dev test quick_test push-latest push-latest-% push-% push
+.PHONY:: yapf dockerfiles Dockerfile-% quick_build build build-% dev-% quick-dev test quick_test push-latest push-latest-% push-% push version .FORCE