From 3d69e1ff903f79ed67f2995dc8bc09d30df49e34 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Sat, 6 Jun 2015 17:55:47 +0200 Subject: [PATCH] Clean and fix scripts in bin directory --- README.md | 25 +++++++++++++------------ bin/app | 18 ------------------ bin/enter | 2 ++ bin/{test/enter => enter-bash} | 0 bin/id_rsa | 27 +++++++++++++++++++++++++++ bin/{test => }/pidenter | 0 bin/{run => run-bash} | 0 bin/ssh | 20 +++++--------------- bin/test/attach | 1 - bin/test/config | 14 -------------- bin/test/setup => setup | 3 ++- bin/test/test => test | 0 12 files changed, 49 insertions(+), 61 deletions(-) delete mode 100644 bin/app create mode 100644 bin/enter rename bin/{test/enter => enter-bash} (100%) create mode 100644 bin/id_rsa rename bin/{test => }/pidenter (100%) rename bin/{run => run-bash} (100%) delete mode 100644 bin/test/attach delete mode 100644 bin/test/config rename bin/test/setup => setup (93%) rename bin/test/test => test (100%) diff --git a/README.md b/README.md index 41ea0a2..d7a4007 100644 --- a/README.md +++ b/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 - -### In $DOCKER_HOME/images/<image>/ -#### app - -#### run - -#### ssh - - +Stop all running containers. +### enter +Use nsenter to execute a command in the specified running container (deprecated by docker-exec). +### enter-bash +Use nsenter to execute bash in the specified running container (deprecated by docker-exec). Images are build using Makefiles in order to provide reusable pieces of functionality. diff --git a/bin/app b/bin/app deleted file mode 100644 index d88d4fd..0000000 --- a/bin/app +++ /dev/null @@ -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" diff --git a/bin/enter b/bin/enter new file mode 100644 index 0000000..088b184 --- /dev/null +++ b/bin/enter @@ -0,0 +1,2 @@ +PID=`docker inspect -f "{{ .State.Pid }}" $1` +nsenter --target $PID --mount --uts --ipc --net --pid -- $2 -l diff --git a/bin/test/enter b/bin/enter-bash similarity index 100% rename from bin/test/enter rename to bin/enter-bash diff --git a/bin/id_rsa b/bin/id_rsa new file mode 100644 index 0000000..b231785 --- /dev/null +++ b/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----- diff --git a/bin/test/pidenter b/bin/pidenter similarity index 100% rename from bin/test/pidenter rename to bin/pidenter diff --git a/bin/run b/bin/run-bash similarity index 100% rename from bin/run rename to bin/run-bash diff --git a/bin/ssh b/bin/ssh index 71845a8..3e63f39 100644 --- a/bin/ssh +++ b/bin/ssh @@ -1,23 +1,13 @@ -DIR=`dirname $0` -DIR=`readlink -e $DIR` -BASE=`basename $DIR` -IFS='/' read -ra ADDR <<< "$DIR" -CONTAINER=${ADDR[-2]} -ID=`docker ps --no-trunc | grep $CONTAINER: | cut -d' ' -f1` +ID=`docker ps --no-trunc | grep $1 | cut -d' ' -f1` +ARGS="${*:2}" 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 - DISPLAY=:0 - chmod 0666 id_rsa - su user -c "$COMMAND \"$2\"" - else - chmod 0600 id_rsa - eval "$COMMAND \"$1\"" - fi + chmod 0600 id_rsa + eval "$COMMAND \"$ARGS\"" else echo "Container is not running." fi \ No newline at end of file diff --git a/bin/test/attach b/bin/test/attach deleted file mode 100644 index ee4900b..0000000 --- a/bin/test/attach +++ /dev/null @@ -1 +0,0 @@ -lxc-attach -n `docker ps --no-trunc | grep $1: | cut -d' ' -f1` diff --git a/bin/test/config b/bin/test/config deleted file mode 100644 index 60c39ac..0000000 --- a/bin/test/config +++ /dev/null @@ -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 \ No newline at end of file diff --git a/bin/test/setup b/setup similarity index 93% rename from bin/test/setup rename to setup index fb97865..868a158 100644 --- a/bin/test/setup +++ b/setup @@ -48,4 +48,5 @@ if [ -z "$DOCKER_HOME" ]; then $sh_c "echo DOCKER_HOME=$home >> /etc/environment" fi -mkdir -p $DOCKER_HOME \ No newline at end of file +mkdir -p $DOCKER_HOME +docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter \ No newline at end of file diff --git a/bin/test/test b/test similarity index 100% rename from bin/test/test rename to test