docker
/
docker-ubuntu-vnc-desktop
mirror of https://github.com/fcwu/docker-ubuntu-vnc-desktop
1
0
Fork 0
Code Issues Releases Activity

Merge pull request #7 from devindice/Fix-groups-and-ownership 

Update startup.sh
This commit is contained in:
Devin Dice 2022-08-18 16:21:43 -04:00 committed by GitHub
parent 6485c23757 b937ce3748
commit a45a9df9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rootfs/startup.sh
View File

@ -33,7 +33,7 @@ HOME=/root
if [ "$USER" != "root" ]; then if [ "$USER" != "root" ]; then
echo "* enable custom user: $USER" echo "* enable custom user: $USER"
#useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker -d /workspace/.home/$USER $USER #useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker -d /workspace/.home/$USER $USER
useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker $USER useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker $(if [ -z $PUID ]; then echo "--uid $PUID"; fi) $(if [ -z $PGID ]; then echo "--gid $PGID"; fi) $USER
if [ -z "$PASSWORD" ]; then if [ -z "$PASSWORD" ]; then
echo " set default password to \"ubuntu\"" echo " set default password to \"ubuntu\""
@ -43,11 +43,11 @@ if [ "$USER" != "root" ]; then
PASSWORD=$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20) PASSWORD=$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)
fi fi
#HOME=/workspace/.home/$USER #HOME=/workspace/.home/$USER
HOME=/home/$USER HOME=/home/$USER
echo "$USER:$PASSWORD" | chpasswd echo "$USER:$PASSWORD" | chpasswd
cp -r /root/{.config,.gtkrc-2.0,.asoundrc} ${HOME} cp -r /root/{.config,.gtkrc-2.0,.asoundrc} ${HOME}
chown -R $USER:$USER ${HOME}
[ -d "/dev/snd" ] && chgrp -R adm /dev/snd [ -d "/dev/snd" ] && chgrp -R adm /dev/snd
fi fi
sed -i -e "s|%USER%|$USER|" -e "s|%HOME%|$HOME|" /etc/supervisor/conf.d/supervisord.conf sed -i -e "s|%USER%|$USER|" -e "s|%HOME%|$HOME|" /etc/supervisor/conf.d/supervisord.conf
@ -134,6 +134,4 @@ grep "file:///home/$USER/Downloads" /home/$USER/.config/gtk-3.0/bookmarks || ech
grep "127.0.0.1 archive.linux.duke.edu" /etc/hosts || echo "127.0.0.1 archive.linux.duke.edu" >> /etc/hosts grep "127.0.0.1 archive.linux.duke.edu" /etc/hosts || echo "127.0.0.1 archive.linux.duke.edu" >> /etc/hosts
chown -R $USER:$USER /home/$USER/
exec /bin/tini -- supervisord -n -c /etc/supervisor/supervisord.conf exec /bin/tini -- supervisord -n -c /etc/supervisor/supervisord.conf