From 2474844856ab5c53398005ebc455eb53676ac5d5 Mon Sep 17 00:00:00 2001
From: Assaf Arkin <assaf@labnotes.org>
Date: Wed, 9 Apr 2014 13:06:52 -0700
Subject: [PATCH] CHANGED use namespace dokku for docker 0.10 compatibility

---
 dokku                                | 8 ++++----
 plugins/00_dokku-standard/commands   | 4 ++--
 plugins/00_dokku-standard/pre-delete | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dokku b/dokku
index 30e8582d8..e0b61ba63 100755
--- a/dokku
+++ b/dokku
@@ -14,7 +14,7 @@ fi
 
 case "$1" in
   receive)
-    APP="$2"; IMAGE="app/$APP"
+    APP="$2"; IMAGE="dokku/$APP"
     echo "-----> Cleaning up ..."
     dokku cleanup
     echo "-----> Building $APP ..."
@@ -29,7 +29,7 @@ case "$1" in
     ;;
 
   build)
-    APP="$2"; IMAGE="app/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+    APP="$2"; IMAGE="dokku/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
     id=$(cat | docker run -i -a stdin progrium/buildstep /bin/bash -c "mkdir -p /app && tar -xC /app")
     test $(docker wait $id) -eq 0
     docker commit $id $IMAGE > /dev/null
@@ -43,7 +43,7 @@ case "$1" in
     ;;
 
   release)
-    APP="$2"; IMAGE="app/$APP"
+    APP="$2"; IMAGE="dokku/$APP"
     pluginhook pre-release $APP
     if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
       id=$(cat "$DOKKU_ROOT/$APP/ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/app-env.sh")
@@ -54,7 +54,7 @@ case "$1" in
     ;;
 
   deploy)
-    APP="$2"; IMAGE="app/$APP"
+    APP="$2"; IMAGE="dokku/$APP"
     pluginhook pre-deploy $APP
 
     # kill the app when running
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index b91ddf729..1d981fc2e 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -6,7 +6,7 @@ case "$1" in
         echo "Please specify an app to delete"
         exit 1
     fi
-    APP="$2"; IMAGE="app/$APP";
+    APP="$2"; IMAGE="dokku/$APP";
     if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
         echo "App does not exist"
         exit 1
@@ -53,7 +53,7 @@ case "$1" in
         echo "Please specify an app to run the command on"
         exit 1
     fi
-    APP="$2"; IMAGE="app/$APP"
+    APP="$2"; IMAGE="dokku/$APP"
     if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
         echo "App $APP does not exist"
         exit 1
diff --git a/plugins/00_dokku-standard/pre-delete b/plugins/00_dokku-standard/pre-delete
index f74a343a1..5a14726e3 100755
--- a/plugins/00_dokku-standard/pre-delete
+++ b/plugins/00_dokku-standard/pre-delete
@@ -2,7 +2,7 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 APP="$1"
-IMAGE=app/"$1"
+IMAGE=dokku/"$1"
 CACHE_DIR="$DOKKU_ROOT/$APP/cache"
 
 docker run -v $CACHE_DIR:/cache $IMAGE find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \;