Merge pull request #669 from ohardy/master

This commit is contained in:
Jose Diaz-Gonzalez
2014-11-23 20:22:35 -05:00
2 changed files with 9 additions and 1 deletions

7
dokku
View File

@@ -11,7 +11,7 @@ export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
[[ $DOKKU_TRACE ]] && set -x
if [[ $(id -un) != "dokku" && $1 != plugins-install* ]]; then
if [[ $(id -un) != "dokku" && $1 != plugins-install* && $1 != "plugins-update" ]]; then
sudo -u dokku -H $0 "$@"
exit
fi
@@ -134,6 +134,10 @@ case "$1" in
pluginhook dependencies
;;
plugins-update)
pluginhook update
;;
# temporary hack for https://github.com/progrium/dokku/issues/82
deploy:all)
for app in $(ls -d $DOKKU_ROOT/*/CONTAINER); do
@@ -147,6 +151,7 @@ case "$1" in
help Print the list of commands
plugins Print active plugins
plugins-install Install active plugins
plugins-update Update active plugins
EOF
;;

View File

@@ -55,6 +55,9 @@ server\.crt and server\.key
.B plugins-install
Install active plugins.
.TP
.B plugins-update
Update active plugins.
.TP
.B plugins
Print active plugins.
.TP