From d150321741e958947c1aa1afd90bf0675ad3746e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Tue, 3 Oct 2017 18:24:30 +0200 Subject: [PATCH] Updated makefiles from meaningcloud * Fixed some python+docker variables * Improved defaults for docker image names --- base.mk | 12 +++++------- docker.mk | 6 +++++- python.mk | 10 +++++++++- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/base.mk b/base.mk index cc27cfa..f67f682 100644 --- a/base.mk +++ b/base.mk @@ -2,18 +2,16 @@ export NAME ?= $(shell basename $(CURDIR)) VERSION ?= $(shell git describe --tags --dirty 2>/dev/null) +ifeq ($(wildcard $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 diff --git a/docker.mk b/docker.mk index 4845c2f..f74d93f 100644 --- a/docker.mk +++ b/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 diff --git a/python.mk b/python.mk index 33d012e..f14cc7a 100644 --- a/python.mk +++ b/python.mk @@ -1,9 +1,17 @@ PYVERSIONS ?= 2.7 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