mathieu/config
1
1
Fork 0
Code Issues Pull Requests Releases Activity

zsh: sdocker more verbose

Browse Source
This commit is contained in:
Mathieu Maret 2022-07-12 14:27:20 +02:00
parent bc8a69ede5
commit 2dcb6bdcf7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.zsh/40_function.zsh
View File

@ -285,16 +285,18 @@ sdocker (){
AOSP_ARGS=${AOSP_ARGS:--it} AOSP_ARGS=${AOSP_ARGS:--it}
img=$(docker ps | grep $1 | awk '{print $1}'); img=$(docker ps | grep $1 | awk '{print $1}');
if [ -z $img ]; then if [ -z $img ]; then
img=$(docker ps -a | grep -w $1 | awk '{print $1}' | head -1); details=$(docker ps -a | grep -w $1 | head -1);
img=$(echo ${details} | awk '{print $1}')
img_name=$(echo ${details} | awk '{print $2}')
if [ -z $img ]; then if [ -z $img ]; then
echo "Running a new container" echo "Running a new container with image $img_name"
docker run ${AOSP_ARGS} ${=SSH_AUTH_ARGS} -h $(hostname) -e DISPLAY=${DISPLAY} --privileged -v /dev/bus/usb:/dev/bus/usb -v /tmp/.X11-unix/:/tmp/.X11-unix/ -v ${AOSP_IMAGE}:/aosp/Project -v $HOME/Sources/:/aosp/Sources/ -v /local/:/local/ --user="$(id -u):$(id -g)" $1 docker run ${AOSP_ARGS} ${=SSH_AUTH_ARGS} -h $(hostname) -e DISPLAY=${DISPLAY} --privileged -v /dev/bus/usb:/dev/bus/usb -v /tmp/.X11-unix/:/tmp/.X11-unix/ -v ${AOSP_IMAGE}:/aosp/Project -v $HOME/Sources/:/aosp/Sources/ -v /local/:/local/ --user="$(id -u):$(id -g)" $1
else else
echo "Starting $img" echo "Starting $img|$img_name"
docker start -i -a $img docker start -i -a $img
fi fi
else else
echo "Attach to $img" echo "Attach to $img|$img_name"
eval docker exec ${DOCKER_EXEC_ARGS} -it $img /bin/bash eval docker exec ${DOCKER_EXEC_ARGS} -it $img /bin/bash
fi fi
} }