diff --git a/bocker b/bocker index 0c6cfac..8856cb2 100755 --- a/bocker +++ b/bocker @@ -2,94 +2,94 @@ set -o errexit -o nounset -o pipefail; shopt -s nullglob btrfs_path='/var/bocker'; function bocker_check() { -btrfs subvolume list "$btrfs_path" | grep -qw "$1" && echo 0 || echo 1 + btrfs subvolume list "$btrfs_path" | grep -qw "$1" && echo 0 || echo 1 } function bocker_init() { #HELP Create an image from a directory:\nBOCKER init -uuid="img_$(shuf -i 42002-42254 -n 1)" -if [[ -d "$1" ]]; then - [[ "$(bocker_check "$uuid")" == 0 ]] && bocker_run "$@" - btrfs subvolume create "$btrfs_path/$uuid" > /dev/null - cp -rf --reflink=auto "$1"/* "$btrfs_path/$uuid" > /dev/null - [[ ! -f "$btrfs_path/$uuid"/img.source ]] && echo "$1" > "$btrfs_path/$uuid"/img.source - echo "Created: $uuid" -else - echo "No directory named '$1' exists" -fi + uuid="img_$(shuf -i 42002-42254 -n 1)" + if [[ -d "$1" ]]; then + [[ "$(bocker_check "$uuid")" == 0 ]] && bocker_run "$@" + btrfs subvolume create "$btrfs_path/$uuid" > /dev/null + cp -rf --reflink=auto "$1"/* "$btrfs_path/$uuid" > /dev/null + [[ ! -f "$btrfs_path/$uuid"/img.source ]] && echo "$1" > "$btrfs_path/$uuid"/img.source + echo "Created: $uuid" + else + echo "No directory named '$1' exists" + fi } function bocker_pull() { #HELP Pull an image from Docker Hub:\nBOCKER pull -token="$(curl -sL -o /dev/null -D- -H 'X-Docker-Token: true' "https://index.docker.io/v1/repositories/$1/images" | tr -d '\r' | awk -F ': *' '$1 == "X-Docker-Token" { print $2 }')" -registry='https://registry-1.docker.io/v1' -id="$(curl -sL -H "Authorization: Token $token" "$registry/repositories/$1/tags/$2" | sed 's/"//g')" -[[ "${#id}" -ne 64 ]] && echo "No image named '$1:$2' exists" && exit 1 -ancestry="$(curl -sL -H "Authorization: Token $token" "$registry/images/$id/ancestry")" -IFS=',' && ancestry=(${ancestry//[\[\] \"]/}) && unset IFS; tmp_uuid="$(uuidgen)" && mkdir /tmp/"$tmp_uuid" -for id in "${ancestry[@]}"; do - curl -#L -H "Authorization: Token $token" "$registry/images/$id/layer" -o /tmp/"$tmp_uuid"/layer.tar - tar xf /tmp/"$tmp_uuid"/layer.tar -C /tmp/"$tmp_uuid" && rm /tmp/"$tmp_uuid"/layer.tar -done -echo "$1:$2" > /tmp/"$tmp_uuid"/img.source -bocker_init /tmp/"$tmp_uuid" && rm -rf /tmp/"$tmp_uuid" + token="$(curl -sL -o /dev/null -D- -H 'X-Docker-Token: true' "https://index.docker.io/v1/repositories/$1/images" | tr -d '\r' | awk -F ': *' '$1 == "X-Docker-Token" { print $2 }')" + registry='https://registry-1.docker.io/v1' + id="$(curl -sL -H "Authorization: Token $token" "$registry/repositories/$1/tags/$2" | sed 's/"//g')" + [[ "${#id}" -ne 64 ]] && echo "No image named '$1:$2' exists" && exit 1 + ancestry="$(curl -sL -H "Authorization: Token $token" "$registry/images/$id/ancestry")" + IFS=',' && ancestry=(${ancestry//[\[\] \"]/}) && unset IFS; tmp_uuid="$(uuidgen)" && mkdir /tmp/"$tmp_uuid" + for id in "${ancestry[@]}"; do + curl -#L -H "Authorization: Token $token" "$registry/images/$id/layer" -o /tmp/"$tmp_uuid"/layer.tar + tar xf /tmp/"$tmp_uuid"/layer.tar -C /tmp/"$tmp_uuid" && rm /tmp/"$tmp_uuid"/layer.tar + done + echo "$1:$2" > /tmp/"$tmp_uuid"/img.source + bocker_init /tmp/"$tmp_uuid" && rm -rf /tmp/"$tmp_uuid" } function bocker_rm() { #HELP Delete an image or container:\nBOCKER rm -[[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1 -btrfs subvolume delete "$btrfs_path/$1" > /dev/null -echo "Removed: $1" + [[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1 + btrfs subvolume delete "$btrfs_path/$1" > /dev/null + echo "Removed: $1" } function bocker_images() { #HELP List images:\nBOCKER images -echo -e "IMAGE_ID\t\tSOURCE" -for img in "$btrfs_path"/img_*; do - img=$(basename "$img") - echo -e "$img\t\t$(cat "$btrfs_path/$img/img.source")" -done + echo -e "IMAGE_ID\t\tSOURCE" + for img in "$btrfs_path"/img_*; do + img=$(basename "$img") + echo -e "$img\t\t$(cat "$btrfs_path/$img/img.source")" + done } function bocker_ps() { #HELP List containers:\nBOCKER ps -echo -e "CONTAINER_ID\t\tCOMMAND" -for ps in "$btrfs_path"/ps_*; do - ps=$(basename "$ps") - echo -e "$ps\t\t$(cat "$btrfs_path/$ps/$ps.cmd")" -done + echo -e "CONTAINER_ID\t\tCOMMAND" + for ps in "$btrfs_path"/ps_*; do + ps=$(basename "$ps") + echo -e "$ps\t\t$(cat "$btrfs_path/$ps/$ps.cmd")" + done } function bocker_run() { #HELP Create a container:\nBOCKER run -uuid="ps_$(shuf -i 42002-42254 -n 1)" -[[ "$(bocker_check "$1")" == 1 ]] && echo "No image named '$1' exists" && exit 1 -[[ "$(bocker_check "$uuid")" == 0 ]] && echo "UUID conflict, retrying..." && bocker_run "$@" && return -cmd=${@:2} && ip="$(echo "${uuid: -3}" | sed 's/0//g')" && mac="${uuid: -3:1}:${uuid: -2}" -ip link add dev veth0_"$uuid" type veth peer name veth1_"$uuid" -ip link set dev veth0_"$uuid" up -ip link set veth0_"$uuid" master bridge0 -ip netns add netns_"$uuid" -ip link set veth1_"$uuid" netns netns_"$uuid" -ip netns exec netns_"$uuid" ip link set dev lo up -ip netns exec netns_"$uuid" ip link set veth1_"$uuid" address 02:42:ac:11:00"$mac" -ip netns exec netns_"$uuid" ip addr add 10.0.0."$ip"/24 dev veth1_"$uuid" -ip netns exec netns_"$uuid" ip link set dev veth1_"$uuid" up -ip netns exec netns_"$uuid" ip route add default via 10.0.0.1 -btrfs subvolume snapshot "$btrfs_path/$1" "$btrfs_path/$uuid" > /dev/null -echo 'nameserver 8.8.8.8' > "$btrfs_path/$uuid"/etc/resolv.conf -echo "$cmd" > "$btrfs_path/$uuid/$uuid.cmd" -ip netns exec netns_"$uuid" "unshare" -fmuip --mount-proc "chroot" \ - "$btrfs_path/$uuid" /bin/sh -c "/bin/mount -t proc proc /proc && $cmd" \ - 2>&1 | tee "$btrfs_path/$uuid/$uuid.log" || true -ip link del dev veth0_"$uuid" -ip netns del netns_"$uuid" + uuid="ps_$(shuf -i 42002-42254 -n 1)" + [[ "$(bocker_check "$1")" == 1 ]] && echo "No image named '$1' exists" && exit 1 + [[ "$(bocker_check "$uuid")" == 0 ]] && echo "UUID conflict, retrying..." && bocker_run "$@" && return + cmd=${@:2} && ip="$(echo "${uuid: -3}" | sed 's/0//g')" && mac="${uuid: -3:1}:${uuid: -2}" + ip link add dev veth0_"$uuid" type veth peer name veth1_"$uuid" + ip link set dev veth0_"$uuid" up + ip link set veth0_"$uuid" master bridge0 + ip netns add netns_"$uuid" + ip link set veth1_"$uuid" netns netns_"$uuid" + ip netns exec netns_"$uuid" ip link set dev lo up + ip netns exec netns_"$uuid" ip link set veth1_"$uuid" address 02:42:ac:11:00"$mac" + ip netns exec netns_"$uuid" ip addr add 10.0.0."$ip"/24 dev veth1_"$uuid" + ip netns exec netns_"$uuid" ip link set dev veth1_"$uuid" up + ip netns exec netns_"$uuid" ip route add default via 10.0.0.1 + btrfs subvolume snapshot "$btrfs_path/$1" "$btrfs_path/$uuid" > /dev/null + echo 'nameserver 8.8.8.8' > "$btrfs_path/$uuid"/etc/resolv.conf + echo "$cmd" > "$btrfs_path/$uuid/$uuid.cmd" + ip netns exec netns_"$uuid" "unshare" -fmuip --mount-proc "chroot" \ + "$btrfs_path/$uuid" /bin/sh -c "/bin/mount -t proc proc /proc && $cmd" \ + 2>&1 | tee "$btrfs_path/$uuid/$uuid.log" || true + ip link del dev veth0_"$uuid" + ip netns del netns_"$uuid" } function bocker_exec() { #HELP Execute a command in an existing container:\nBOCKER exec -[[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1 -cmd=${@:2} && cid=$(ps xao ppid,pid,cmd | grep "$(ps -u | grep unshare | grep "$1" | awk '{ print $2 }')" | grep -v unshare | awk '{ print $2 }') -nsenter -t "$cid" -muinp chroot "$btrfs_path/$1" "$cmd" + [[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1 + cmd=${@:2} && cid=$(ps xao ppid,pid,cmd | grep "$(ps -u | grep unshare | grep "$1" | awk '{ print $2 }')" | grep -v unshare | awk '{ print $2 }') + nsenter -t "$cid" -muinp chroot "$btrfs_path/$1" "$cmd" } function bocker_logs() { #HELP View logs from a container:\nBOCKER logs -[[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1 -cat "$btrfs_path/$1/$1.log" + [[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1 + cat "$btrfs_path/$1/$1.log" } function bocker_commit() { #HELP Commit a container to an image:\nBOCKER commit -[[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1 -[[ "$(bocker_check "$2")" == 1 ]] && echo "No image named '$1' exists" && exit 1 -bocker_rm "$2" && btrfs subvolume snapshot "$btrfs_path/$1" "$btrfs_path/$2" > /dev/null -echo "Created: $2" + [[ "$(bocker_check "$1")" == 1 ]] && echo "No container named '$1' exists" && exit 1 + [[ "$(bocker_check "$2")" == 1 ]] && echo "No image named '$1' exists" && exit 1 + bocker_rm "$2" && btrfs subvolume snapshot "$btrfs_path/$1" "$btrfs_path/$2" > /dev/null + echo "Created: $2" } function bocker_help() { #HELP Display this message:\nBOCKER help -sed -n "s/^.*#HELP\\s//p;" < "$1" | sed "s/\\\\n/\n\t/g;s/$/\n/;s!BOCKER!${1/!/\\!}!g" + sed -n "s/^.*#HELP\\s//p;" < "$1" | sed "s/\\\\n/\n\t/g;s/$/\n/;s!BOCKER!${1/!/\\!}!g" } [[ -z "${1-}" ]] && bocker_help "$0" case $1 in diff --git a/tests/test_run b/tests/test_run index ea68fd3..5734e59 100644 --- a/tests/test_run +++ b/tests/test_run @@ -2,14 +2,14 @@ set -o errexit -o nounset -o pipefail function bocker_run_test() { -./bocker run "$1" "$2" > /dev/null -ps="$(./bocker ps | grep "$2" | awk '{print $1}')" -logs="$(./bocker logs "$ps")" -if [[ "$logs" == *"$3"* ]]; then - echo 0 -else - echo 1 -fi + ./bocker run "$1" "$2" > /dev/null + ps="$(./bocker ps | grep "$2" | awk '{print $1}')" + logs="$(./bocker logs "$ps")" + if [[ "$logs" == *"$3"* ]]; then + echo 0 + else + echo 1 + fi } img="$(./bocker init ~/base-image | awk '{print $2}')"