Merge branch 'fix-metalcut' into 'master'

Fix homedir mount; Add /media to metalcut container

See merge request fablab/labsync!36
This commit is contained in:
jalr 2018-07-15 11:49:30 +00:00
commit 5d374a0ccb

View file

@ -4,7 +4,7 @@ remote='{{ fablab.metalcut.socket }}'
image='{{ fablab.metalcut.dockerimage }}'
if [ ! -z "$SUDO_COMMAND" ] && [ "$SUDO_COMMAND" = "$0" ]; then
home="$(getent passwd "$SUDO_USER" | cut -d: -f6)"
home="$(getent passwd "$SUDO_UID" | cut -d: -f6)"
uid="$SUDO_UID"
gid="$SUDO_GID"
else
@ -19,6 +19,7 @@ docker run \
-e DISPLAY \
-e uid="$uid" \
-e gid="$gid" \
-v "$HOME:$home" \
-v "$home:/home/metalcut/work" \
-v '/media:/media' \
-e remote="$remote" \
$image