Merge pull request #861 from progrium/587-custom-dokku-root
Default DOKKU_ROOT to ~dokku if unspecified. Closes #587
This commit is contained in:
3
Makefile
3
Makefile
@@ -4,7 +4,6 @@ SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand
|
|||||||
PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb
|
PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb
|
||||||
STACK_URL ?= https://github.com/progrium/buildstep.git
|
STACK_URL ?= https://github.com/progrium/buildstep.git
|
||||||
PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-12-16/2014-12-16_42bd9f4aab.tar.gz
|
PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-12-16/2014-12-16_42bd9f4aab.tar.gz
|
||||||
DOKKU_ROOT ?= /home/dokku
|
|
||||||
PLUGINS_PATH ?= /var/lib/dokku/plugins
|
PLUGINS_PATH ?= /var/lib/dokku/plugins
|
||||||
|
|
||||||
# If the first argument is "vagrant-dokku"...
|
# If the first argument is "vagrant-dokku"...
|
||||||
@@ -40,7 +39,7 @@ addman:
|
|||||||
mandb
|
mandb
|
||||||
|
|
||||||
version:
|
version:
|
||||||
git describe --tags > ${DOKKU_ROOT}/VERSION 2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ${DOKKU_ROOT}/VERSION
|
git describe --tags > ~dokku/VERSION 2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
|
||||||
|
|
||||||
plugin-dependencies: pluginhook
|
plugin-dependencies: pluginhook
|
||||||
dokku plugins-install-dependencies
|
dokku plugins-install-dependencies
|
||||||
|
|||||||
2
dokku
2
dokku
@@ -4,7 +4,7 @@ shopt -s nullglob
|
|||||||
|
|
||||||
export DOKKU_DISTRO=${DOKKU_DISTRO:="ubuntu"}
|
export DOKKU_DISTRO=${DOKKU_DISTRO:="ubuntu"}
|
||||||
export DOKKU_IMAGE=${DOKKU_IMAGE:="progrium/buildstep"}
|
export DOKKU_IMAGE=${DOKKU_IMAGE:="progrium/buildstep"}
|
||||||
export DOKKU_ROOT=${DOKKU_ROOT:="/home/dokku"}
|
export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
|
||||||
|
|
||||||
export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
|
export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
|
||||||
export DOKKU_NOT_IMPLEMENTED_EXIT=10
|
export DOKKU_NOT_IMPLEMENTED_EXIT=10
|
||||||
|
|||||||
Reference in New Issue
Block a user