From 7548150a08aa8841942d162361067af0db15a6e5 Mon Sep 17 00:00:00 2001
From: Joe Groocock <frebib@gmail.com>
Date: Fri, 12 Aug 2016 15:54:08 +0100
Subject: [PATCH] Improved dsh alias for user specification and added a couple
 other useful docker aliases

---
 aliases | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/aliases b/aliases
index 28dc0ef..e1611b6 100644
--- a/aliases
+++ b/aliases
@@ -125,10 +125,23 @@ alias dbl='docker build'
 alias dbl.='docker build .'
 alias drun='docker run -ti'
 alias dkl='docker kill'
+dklrm() { docker kill $1 ; docker rm $1 }
+alias dst='docker stop'
+alias dlg='docker logs -f'
 alias drm-stopped='docker rm -v $(docker ps -a -q -f status=exited)'
 alias drmi-untag='docker rmi $(docker images -f "dangling=true" -q)'
 dsh() {
-    docker exec -ti $1 /bin/sh
+    user=`echo $1 | cut -d'@' -f1 -s`
+    if [[ -z "$user" ]]; then
+        host="$1"
+        usercmd=""
+    else
+        host=`echo $1 | cut -d'@' -f2 -s`
+        usercmd="--user=$user"
+    fi
+
+    echo "docker exec -ti $usercmd $host /bin/sh"
+    docker exec -ti "$usercmd" "$host" /bin/sh
 }
 
 alias dm='docker-machine'