From 2ed0424860cc2d4bef87749df0a2fbbc7debad29 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshanehobbs@gmail.com>
Date: Thu, 19 Nov 2015 10:40:14 -0500
Subject: [PATCH] app/global override for DOKKU_RM_CONTAINER. closes #1704

---
 plugins/00_dokku-standard/commands | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index 5c350ade6..2591e90b2 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -134,9 +134,13 @@ case "$1" in
 
     shift 2
 
+    DOKKU_APP_RM_CONTAINER=$(dokku config:get $APP DOKKU_RM_CONTAINER || true)
+    DOKKU_GLOBAL_RM_CONTAINER=$(dokku config:get --global DOKKU_RM_CONTAINER || true)
+    DOKKU_RM_CONTAINER=${DOKKU_APP_RM_CONTAINER:="$DOKKU_GLOBAL_RM_CONTAINER"}
+
     DOCKER_ARGS=$(: | plugn trigger docker-args-run $APP $IMAGE_TAG)
     [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
-    [[ $DOKKU_RM_CONTAINER ]] && DOKKU_RUN_OPTS="--rm"
+    [[ "$DOKKU_RM_CONTAINER" ]] && DOKKU_RUN_OPTS="--rm"
     has_tty && DOKKU_RUN_OPTS+=" -i -t"
     is_image_herokuish_based "$IMAGE" && EXEC_CMD="/exec"