Clean and fix scripts in bin directory

README.md

@@ -36,25 +36,26 @@ And make sure to restart the docker daemon. This enables LXC related tricks such
 
 ### In $DOCKER_HOME/bin
 
-#### app
-#### attach
 #### build
+Run build target on makefile for specified image.
 #### clean
+Delete all stopped containers.
 #### killall
+Kill all running containers.
 #### make
+Run specified target on makefile for specified image.
 #### purge
-#### run
+Delete all untagged containers.
+#### run-bash
+Run a container and execute bash.
 #### ssh
+Open a ssh connection to the specified running container and executed a command.
 #### stopall
-
+Stop all running containers.
-### In $DOCKER_HOME/images/<image>/
+### enter
-#### app
+Use nsenter to execute a command in the specified running container (deprecated by docker-exec).
-
+### enter-bash
-#### run
+Use nsenter to execute bash in the specified running container (deprecated by docker-exec).
-
-#### ssh
-
-
 
 Images are build using Makefiles in order to provide reusable pieces of functionality.
 

bin/app

@@ -1,18 +0,0 @@
-DIR=`dirname $0`
-DIR=`readlink -e $DIR`
-BASE=`basename $DIR`
-IFS='/' read -ra ADDR <<< "$DIR"
-CONTAINER=${ADDR[-2]}
-while : ; do
-    ID=`docker ps --no-trunc | grep $CONTAINER: | cut -d' ' -f1`
-    if [ -n "$ID" ]; then
-        break
-    fi
-    if [ ! -n "$STARTED" ]; then
-        echo "Starting container."
-        /opt/docker/bin/run $CONTAINER &
-        STARTED=yes
-        sleep 10
-    fi
-done
-/opt/docker/bin/ssh $CONTAINER $1 "source .profile; /opt/$CONTAINER"

bin/enter

@@ -0,0 +1,2 @@
+PID=`docker inspect -f "{{ .State.Pid }}" $1`
+nsenter --target $PID --mount --uts --ipc --net --pid -- $2 -l

bin/id_rsa

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA75ZiwcUA0bGkPRDx4pKFIIcFgy7nP68pFoXAmqXx4WuCcPl7
+dOcOZEzIrfhCFBNam7LWRfgqMyk53ghJ5SH4I1kXrOTMoE4eYBZGvlpU8xmfHkUr
+mAVzCLgXnnEDd/e4++WJpoMJP6tVvhw7yazcHOPmizrTL4IwdICrjWTMQMg9Y3bJ
+qJgC+m65aUnkIli5JrtHbQG9QSa3wiHhk7riUl+RA7tg6ARZLozOCEUDxbwJXnWA
+SGta19gTjxmO5JziPveEwK4Xycmd1zCI/FElpl5PVrC+iykaQ2fKd1ZIWPGdVitZ
+2v9myDG//Jmsuz1e9f/LKcMPjlrfbXmukT2O6wIDAQABAoIBAQCAsZQcp3iYKsag
+8rArVy7hWQWyAIjA4ZK9gV0C9O5nentXufsBwXcukzwcjsTXycma5sZIUVRBpPxr
+cqJWzRdfzWR1P3VXCn8wd+bKKvWEm5eoB9mx0AOJhHFTbztAvrUDwbld0vct1xe4
+havr2clmT1iwIwn7dAAZJGCCE8nPZXW+3Bc/PVzZYBS2pJJZMR7NgGANoclvIkrO
+IeMCtgoHbPCGT5IcVmESThmVVOcRtH/TwMstftvkAI6q0mfpGZ2BVAGqJzsfYtHD
+3ctrTXila+dMA0tnsLFNdJ+7OPLi1vvZsiZGkA/VnKK/+IFq/0Zw6B7PEzuvDP+U
+OTibN7b5AoGBAP8SDX9z4at66TNNZrCY6VytlS2+7cVvQeOlcfUt6oZ8aVxOfHJ0
+KLlLB2txY2mHb3UD2mLUl7YAlULv3gUkxPyVOZYmpKx/uP3o3ZCSiVSgqMX/Mnj+
+OjDG37UB/fBLOvjx1Csuzun1wxmCaxGlCD+Xn0zkxKNJBTrgUocMPNBnAoGBAPB1
+4628oXwX4UhdDQBfPSPc1WXPxzIoRiE6y8RtBSuw6RvzsNL6reFKA0uR7OhgswhI
+tkbhKaBiUn75rNx83Qi6xPxswQ9DehG2bxMyF26Q5om6UR+XGVSPVJxIzGnMjmpE
+sT2EX0X//RJnzbd5ML3VdfwAuRXL0ArU+yM2FWrdAoGAL49yLN2yqoLUkNhR2YPp
+n3pOYqVDOJkyM/xZb1oMbN8t1iRcWAsIvOQckhAmdTrnsW3yfpMdZrZdHooTX+on
+QOGiRzkVY4S9Pbr59UcdjEYYsjKPergMqaOretjQPMoKSPjuks67jixhIJSM2lFn
+ZFQlQ/U0JS4sZ3oEaWICxOkCgYEAti87v4hpeVHGeEM39I40DpXkgOz56UCmUcrw
+U/SdtEqnc2whDtirIUQoVvtK2Y1aV+5vXCiAl2mnQ1j75VodRd3sHaxwYZYoSH9G
+jO6o3jae1L77c8nRgUXPP1HQvmAjjtRYzVkbrjeTkHxhWp9RlKLEb5hEowT2rR5M
+4JK7i2kCgYEAleQUeVo+71GY8tRScPj3MgxZomyM3PY1QCeSqY3mxQD8RHHHG6I1
+KoEtOCz8ENT0jC+1FdqczGuYqbd60FQ2L94n+KGspqJy9A076Y9lslvyxZ1Yflt3
+g37rT8GCpt4u+bMOT8zlkvncyISFsCayD2tOHnraomT91pbB+9FsFkA=
+-----END RSA PRIVATE KEY-----

bin/ssh

@@ -1,23 +1,13 @@
-DIR=`dirname $0`
+ID=`docker ps --no-trunc | grep $1 | cut -d' ' -f1`
-DIR=`readlink -e $DIR`
+ARGS="${*:2}"
-BASE=`basename $DIR`
-IFS='/' read -ra ADDR <<< "$DIR"
-CONTAINER=${ADDR[-2]}
-ID=`docker ps --no-trunc | grep $CONTAINER: | cut -d' ' -f1`
 if [ -n "$ID" ]; then
     IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $ID`
-    COMMAND="ssh -X -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa $ARGS root@$IP"
+    COMMAND="ssh -X -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa root@$IP"
     if [ ! -e id_rsa ]; then
         docker cp $ID:/opt/id_rsa .
     fi
-    if [ ! -z "$1" ] && [ "$1" == "-l" ]; then
+    chmod 0600 id_rsa
-        DISPLAY=:0
+    eval "$COMMAND \"$ARGS\""
-        chmod 0666 id_rsa
-        su user -c "$COMMAND \"$2\""
-    else
-        chmod 0600 id_rsa
-        eval "$COMMAND \"$1\""
-    fi
 else
     echo "Container is not running."
 fi

bin/test/attach

@@ -1 +0,0 @@
-lxc-attach -n `docker ps --no-trunc | grep $1: | cut -d' ' -f1`

bin/test/config

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-command_test() {
-	echo "$@"
-	echo "$1"
-}
-
-command_remove() {
-    cat bla | xargs echo
-}
-
-command_test bla
-command_test bla da ra

setup

@@ -48,4 +48,5 @@ if [ -z "$DOCKER_HOME" ]; then
     $sh_c "echo DOCKER_HOME=$home >> /etc/environment"
 fi
 
-mkdir -p $DOCKER_HOME
+mkdir -p $DOCKER_HOME
+docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter