Merge branch 'master' into s3lva-kumar/ansible-role

Makefile

@@ -4,10 +4,19 @@ TAR="tar"
 GREP="grep"
 NODE="node"
 NPM="npm"
-DESTDIR="./dist"
-PKG_VERSION := $( $(GREP) -Po '(?<="version": ")[^"]*' )
-TMPDIR := $(shell mktemp -d)
 HOSTS_FILE = $(HOSTS_FILE)
+NODEJQ="node_modules/node-jq/bin/jq"
+SQLITE="sqlite3"
+CONF="src/config.json"
+PHP="php"
+CURL="curl"
+DESTDIR = $(shell $(CURDIR)/$(NODEJQ) -r ".dest" $(CURDIR)/$(CONF))
+NPX="npx"
+PKG_VERSION = $(shell $(CURDIR)/$(NODEJQ) -r ".version" $(CURDIR)/package.json)
+TMPDIR = $(shell mktemp -d)
+DOCKER_IMAGE = "$(shell basename $(CURDIR) | tr [:upper:] [:lower:])"
+DOCKER_TAG="$(DOCKER_TAG)"
+CONTAINER_NAME="$(CONTAINER_NAME)"
 # default modules
 MODULES="php"
 
@@ -51,7 +60,7 @@ install: installdirs
 
 submodule-update:
 	cd ansible/ansible-role-uguu
-	git submodule update
+	git submodule update --remote
 
 deploy:
 	ansible-playbook -i $(HOSTS_FILE) ansible/site.yml