Merge pull request #927 from progrium/906-mh-docker-args-phase-pluginhooks

support both docker-args PHASE and docker-args-PHASE for the time being. closes #906
2015-02-04 11:13:14 -05:00
parent 30d660335f 1b22f69b9e
commit 72a58bbda3
2 changed files with 5 additions and 0 deletions
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -49,6 +49,7 @@ case "$1" in
    shift 2

    DOCKER_ARGS=$(: | pluginhook docker-args $APP run)
+    DOCKER_ARGS+=$(: | pluginhook docker-args-run $APP)
    [[ "$(/usr/bin/tty || true)" != "not a tty" ]] && DOKKU_RUN_OPTS="-i -t"

    docker run $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE /exec "$@"