Separate plugin-install command

This commit is contained in:
Alexander
2013-07-02 23:02:42 +02:00
parent 67958431b0
commit eaa486e888
2 changed files with 10 additions and 5 deletions

View File

@@ -13,6 +13,7 @@ install:
plugins: pluginhook docker plugins: pluginhook docker
mkdir -p /var/lib/dokku/plugins mkdir -p /var/lib/dokku/plugins
cp -r plugins/* /var/lib/dokku/plugins cp -r plugins/* /var/lib/dokku/plugins
dokku plugins-install
dokku plugins dokku plugins
dependencies: gitreceive sshcommand pluginhook docker stack dependencies: gitreceive sshcommand pluginhook docker stack
@@ -47,4 +48,4 @@ count:
@echo "Plugin lines:" @echo "Plugin lines:"
@find plugins -type f | xargs cat | wc -l @find plugins -type f | xargs cat | wc -l
@echo "Test lines:" @echo "Test lines:"
@find tests -type f | xargs cat | wc -l @find tests -type f | xargs cat | wc -l

12
dokku
View File

@@ -13,7 +13,7 @@ case "$1" in
echo " $(dokku url $APP)" echo " $(dokku url $APP)"
echo echo
;; ;;
build) build)
IMAGE="$2" IMAGE="$2"
id=$(cat | docker run -i -a stdin progrium/buildstep /bin/bash -c "mkdir -p /app && tar -xC /app") 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 test $(docker wait $id) -eq 0
docker commit $id $IMAGE > /dev/null docker commit $id $IMAGE > /dev/null
;; ;;
deploy) deploy)
APP="$2"; IMAGE="$3" APP="$2"; IMAGE="$3"
pluginhook pre-deploy $APP $IMAGE pluginhook pre-deploy $APP $IMAGE
@@ -46,8 +46,11 @@ case "$1" in
pluginhook post-deploy $APP $port pluginhook post-deploy $APP $port
;; ;;
plugins) plugins)
ls -1 -d $PLUGIN_PATH/*/ ls -1 -d $PLUGIN_PATH/*/
;;
plugins-install)
pluginhook install pluginhook install
;; ;;
@@ -55,6 +58,7 @@ case "$1" in
cat<<EOF | pluginhook commands help | sort cat<<EOF | pluginhook commands help | sort
help Print the list of commands help Print the list of commands
plugins Print active plugins plugins Print active plugins
plugins-install Install active plugins
EOF EOF
;; ;;
@@ -62,4 +66,4 @@ EOF
pluginhook commands "$@" pluginhook commands "$@"
;; ;;
esac esac