Merge branch 'master' of https://github.com/Boukefalos/docker-deployment

bin/test/attach

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

bin/test/config

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

bin/test/enter

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

bin/test/pidenter

@@ -0,0 +1 @@
+nsenter --target $1 --mount --uts --ipc --net --pid -- /bin/bash -l

bin/test/setup

@@ -0,0 +1,51 @@
+#!/bin/sh
+set -e
+#
+# This script is meant for quick & easy install via:
+#   'curl -sL https://raw.githubusercontent.com/Boukefalos/docker-deployment/master/setup | sh'
+# or:
+#   'wget -qO- https://raw.githubusercontent.com/Boukefalos/docker-deployment/master/setup | sh'
+
+home=/opt/docker
+url='https://get.docker.io/'
+
+command_exists() {
+	command -v "$@" > /dev/null 2>&1
+}
+
+if ! command_exists docker; then
+    echo Docker should be installed!
+    exit 0
+fi
+
+user="$(id -un 2>/dev/null || true)"
+
+sh_c='sh -c'
+if [ "$user" != 'root' ]; then
+	if command_exists sudo; then
+		sh_c='sudo sh -c'
+	elif command_exists su; then
+		sh_c='su -c'
+	else
+		echo >&2 'Error: this installer needs the ability to run commands as root.'
+		echo >&2 'We are unable to find either "sudo" or "su" available to make this happen.'
+		exit 1
+	fi
+fi
+
+curl=''
+if command_exists curl; then
+	curl='curl -sL'
+elif command_exists wget; then
+	curl='wget -qO-'
+elif command_exists busybox && busybox --list-modules | grep -q wget; then
+	curl='busybox wget -qO-'
+fi
+
+if [ -z "$DOCKER_HOME" ]; then
+    echo "DOCKER_HOME has not been set, defaulting to $home"
+    export DOCKER_HOME=$home
+    $sh_c "echo DOCKER_HOME=$home >> /etc/environment"
+fi
+
+mkdir -p $DOCKER_HOME

bin/test/test

@@ -0,0 +1,7 @@
+docker run -t -i -n=false \
+  --lxc-conf="lxc.network.type = veth" \
+  --lxc-conf="lxc.network.flags = up" \
+  --lxc-conf="lxc.network.link = br0" \
+  --lxc-conf="lxc.network.ipv4 = 10.0.2.123" \
+  --lxc-conf="lxc.network.ipv4.gateway=10.0.2.15" \
+  hamachi /bin/bash