From 1b22f69b9e0810636e7651e8037237241cc7063d Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshanehobbs@gmail.com>
Date: Thu, 29 Jan 2015 14:41:14 -0800
Subject: [PATCH] support both docker-args PHASE and docker-args-PHASE for the
 time being. closes #906

---
 dokku                              | 4 ++++
 plugins/00_dokku-standard/commands | 1 +
 2 files changed, 5 insertions(+)

diff --git a/dokku b/dokku
index 36e318c35..ae5619220 100755
--- a/dokku
+++ b/dokku
@@ -55,7 +55,10 @@ case "$1" in
     [[ -d $CACHE_DIR ]] || mkdir $CACHE_DIR
     pluginhook pre-build $APP
 
+    # *DEPRECATED* in v0.4.0: `pluginhook docker-args` will be removed in future releases
+    # https://github.com/progrium/dokku/issues/896 & https://github.com/progrium/dokku/issues/906
     DOCKER_ARGS=$(: | pluginhook docker-args $APP build)
+    DOCKER_ARGS+=$(: | pluginhook docker-args-build $APP)
     id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build/builder)
     docker attach $id
     test "$(docker wait $id)" -eq 0
@@ -85,6 +88,7 @@ case "$1" in
 
     # start the app
     DOCKER_ARGS=$(: | pluginhook docker-args $APP deploy)
+    DOCKER_ARGS+=$(: | pluginhook docker-args-deploy $APP)
     BIND_EXTERNAL=$(pluginhook bind-external-ip $APP)
 
     if [[ "$BIND_EXTERNAL" = "false" ]];then
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index 9358641a4..1f232fefe 100755
--- 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 "$@"