diff --git a/Makefile b/Makefile index 5495ddebf..d641831f8 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ install: plugins: pluginhook docker mkdir -p /var/lib/dokku/plugins cp -r plugins/* /var/lib/dokku/plugins + dokku plugins-install dokku plugins dependencies: gitreceive sshcommand pluginhook docker stack @@ -47,4 +48,4 @@ count: @echo "Plugin lines:" @find plugins -type f | xargs cat | wc -l @echo "Test lines:" - @find tests -type f | xargs cat | wc -l \ No newline at end of file + @find tests -type f | xargs cat | wc -l diff --git a/dokku b/dokku index 4e384edcc..2831de942 100755 --- a/dokku +++ b/dokku @@ -13,7 +13,7 @@ case "$1" in echo " $(dokku url $APP)" echo ;; - + build) IMAGE="$2" id=$(cat | docker run -i -a stdin progrium/buildstep /bin/bash -c "mkdir -p /app && tar -xC /app") @@ -24,7 +24,7 @@ case "$1" in test $(docker wait $id) -eq 0 docker commit $id $IMAGE > /dev/null ;; - + deploy) APP="$2"; IMAGE="$3" pluginhook pre-deploy $APP $IMAGE @@ -46,8 +46,11 @@ case "$1" in pluginhook post-deploy $APP $port ;; - plugins) + plugins) ls -1 -d $PLUGIN_PATH/*/ + ;; + + plugins-install) pluginhook install ;; @@ -55,6 +58,7 @@ case "$1" in cat<