Merge pull request #344 from plietar/commandfix

Fix commands, the easy way.

README.md

@@ -55,6 +55,15 @@ You're done!
 Right now Buildstep supports buildpacks for Node.js, Ruby, Python, [and more](https://github.com/progrium/buildstep#supported-buildpacks). It's not hard to add more, [go add more](https://github.com/progrium/buildstep#adding-buildpacks)!
 Please check the documentation for your particular build pack as you may need to include configuration files (such as a Procfile) in your project root.
 
+## Remote commands
+
+Dokku commands can be run over ssh. Anywhere you would run `dokku <command>`, just run `ssh -t dokku@progriumapp.com <command>`
+The `-t` is used to request a pty. It is highly recommended to do so.
+To avoid the need to type the `-t` option each time, simply create/modify a section in the `.ssh/config`, on the client side, as follows :
+
+    Host progriumapp.com
+    RequestTTY yes
+
 ## Run a command in the app environment
 
 It's possible to run commands in the environment of the deployed application:
@@ -119,13 +128,6 @@ eventually replace the Docker image for buildstep.
 
 You can use [Github Issues](https://github.com/progrium/dokku/issues), check [Troubleshooting](https://github.com/progrium/dokku/wiki/Troubleshooting) on the wiki, or join us on Freenode in #dokku
 
-## Known Issues
-
-The issues are known and should be fixed soon :
-
- * #236: "dokku run" cannot run interactive commands over ssh
- * #272: Most commands hang at the end over ssh. CTRL-D is required to end them. As a workaround for now, run ssh using the `-t` flag.
-
 ## Components
 
  * [Docker](https://github.com/dotcloud/docker) - Container runtime and manager

dokku

@@ -100,7 +100,9 @@ EOF
     ;;
 
   *)
-    pluginhook commands "$@"
+    for script in $(ls -d /var/lib/dokku/plugins/*/commands); do
+      $script "$@"
+    done
     ;;
 
 esac

plugins/00_dokku-standard/commands

@@ -51,7 +51,7 @@ case "$1" in
         exit 1
     fi
     shift 2
-    docker run -i -t -a stdout -a stderr $IMAGE /exec "$@"
+    docker run -i -t $IMAGE /exec "$@"
     ;;
 
   url)
@@ -84,4 +84,4 @@ EOF
     ;;
 
 esac
-cat
+

plugins/backup/commands

@@ -9,7 +9,7 @@ set -e; case "$1" in
     BACKUP_TMP_DIR=$(mktemp -d)
     BACKUP_TMP_FILE="$BACKUP_TMP_DIR/backup.tar"
 
-    pluginhook backup-export 1 $BACKUP_DIR | tar -cf $BACKUP_TMP_FILE --files-from -
+    : | pluginhook backup-export 1 $BACKUP_DIR | tar -cf $BACKUP_TMP_FILE --files-from -
 
     pushd $BACKUP_DIR > /dev/null
     ls -d */ | grep -oE '[^/]+' > "$BACKUP_TMP_DIR/.dokku_backup_apps"
@@ -75,4 +75,4 @@ EOF
     ;;
 
 esac
-cat
+

plugins/config/commands

@@ -173,4 +173,4 @@ EOF
   ;;
 
 esac
-cat
+

plugins/git/commands

@@ -35,6 +35,8 @@ EOF
     git-shell -c "$args"
     ;;
 
+  help)
+    cat
+    ;;
 esac
-cat
 

plugins/nginx-vhosts/commands

@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-cat

tests/run_vagrant

@@ -10,6 +10,7 @@ if [[ ! $(cat ~/.ssh/config 2>/dev/null | grep dokku.me) ]]; then
   touch ~/.ssh/config
   echo "Host dokku.me" >> ~/.ssh/config
   echo "    Port $VAGRANT_SSH_PORT" >> ~/.ssh/config
+  echo "    RequestTTY yes" >> ~/.ssh/config
 fi
 echo "-----> Ensuring Vagrant is running..."
 cd "$(dirname $SELF)/.." && vagrant up | indent