fix: allow overriding both DOKKU_VERSION and GIT_REV via environment variables

This commit is contained in:
Jose Diaz-Gonzalez
2017-01-08 16:41:05 -07:00
parent 4740ee1edc
commit 6ab9e04ba6
4 changed files with 26 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
DOKKU_VERSION = master
DOKKU_VERSION ?= master
SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.6.0/sshcommand
PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.2/plugn_0.2.2_linux_x86_64.tgz
@@ -76,7 +76,11 @@ addman: help2man man-db
mandb
version:
ifeq ($(DOKKU_VERSION),master)
git describe --tags > ~dokku/VERSION 2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
else
echo $(DOKKU_VERSION) > ~dokku/VERSION
endif
plugin-dependencies: plugn
sudo -E dokku plugin:install-dependencies --core