hack: make tmux optional for shell

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2019-03-22 19:29:18 -07:00
parent 252ab3e103
commit 5b5dafde0d
2 changed files with 17 additions and 6 deletions

View File

@ -1,8 +1,17 @@
#!/bin/sh #!/bin/sh
tmux new -s demo -d dockerdCmd="dockerd -s overlay2 -D"
tmux new-window 'dockerd -s overlay2 -D'
tmux new-window if [ -n "$TMUX_ENTRYPOINT" ]; then
tmux a -t demo tmux new -s demo -d
tmux new-window "$dockerdCmd"
tmux new-window
tmux a -t demo
else
( $dockerdCmd 2>/var/log/dockerd.log & )
exec sh
fi

View File

@ -2,11 +2,13 @@
set -e set -e
: ${TMUX=}
function clean { function clean {
docker rmi $(cat $iidfile) docker rmi $(cat $iidfile)
} }
iidfile=$(mktemp -t docker-iidfile.XXXXXXXXXX) iidfile=$(mktemp -t docker-iidfile.XXXXXXXXXX)
docker build --iidfile $iidfile --target demo-env . DOCKER_BUILDKIT=1 docker build --iidfile $iidfile --target demo-env .
trap clean EXIT trap clean EXIT
docker run -it --privileged --rm $(cat $iidfile) docker run -it --privileged --rm -e TMUX_ENTRYPOINT=$TMUX $(cat $iidfile)