mathieu/sdocker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aosp: Don't run sudo unless necessary

Browse Source 
* Clean-up miscellaneous things
* Allow /vol0/aosp to be overridden
* Avoid calling sudo for no reason
This commit is contained in:
Kyle Manna 2014-11-11 22:02:47 -08:00
parent 8197ce17cf
commit 55125c6fd2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/aosp
View File

@ -11,11 +11,18 @@ set -e
AOSP_IMAGE=${AOSP_IMAGE:-kylemanna/aosp} AOSP_IMAGE=${AOSP_IMAGE:-kylemanna/aosp}
AOSP_VOL=${AOSP_VOL:-/vol0} AOSP_VOL=${AOSP_VOL:-/vol0}
AOSP_ARGS=${AOSP_ARGS:---rm -it} AOSP_ARGS=${AOSP_ARGS:---rm -it}
AOSP_VOL_AOSP=${AOSP_VOL_AOSP:-$AOSP_VOL/aosp}
AOSP_VOL_CCACHE=${AOSP_VOL_CCACHE:-$AOSP_VOL/ccache}
sudo bash -c "mkdir -p $AOSP_VOL/{aosp,ccache} && chmod 777 $AOSP_VOL/{aosp,ccache}" if [ ! -d "$AOSP_VOL/aosp" -o ! -d "$AOSP_VOL/aosp" ]; then
sudo mkdir -p $AOSP_VOL_AOSP $AOSP_VOL_CCACHE
sudo chmod 777 $AOSP_VOL_AOSP $AOSP_VOL_CCACHE
fi
[ -n "$SSH_AUTH_SOCK" ] && SSH_AUTH_ARGS="-v $SSH_AUTH_SOCK:/tmp/ssh_auth -e SSH_AUTH_SOCK=/tmp/ssh_auth" if [ -n "$SSH_AUTH_SOCK" ]; then
SSH_AUTH_ARGS="-v $SSH_AUTH_SOCK:/tmp/ssh_auth -e SSH_AUTH_SOCK=/tmp/ssh_auth"
fi
docker run $AOSP_ARGS $SSH_AUTH_ARGS $AOSP_EXTRA_ARGS \ docker run $AOSP_ARGS $SSH_AUTH_ARGS $AOSP_EXTRA_ARGS \
-v "$AOSP_VOL/aosp:/aosp" -v "$AOSP_VOL/ccache:/tmp/ccache" \ -v "$AOSP_VOL_AOSP:/aosp" -v "$AOSP_VOL_CCACHE:/tmp/ccache" \
$AOSP_IMAGE $@ $AOSP_IMAGE $@