mirror of
https://github.com/fcwu/docker-ubuntu-vnc-desktop
synced 2025-12-06 16:32:47 +01:00
Fixes
This commit is contained in:
parent
c96892abd9
commit
b320150b80
2 changed files with 5 additions and 3 deletions
|
|
@ -17,6 +17,8 @@ shopt -s histappend
|
||||||
export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
|
export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
|
||||||
#export HISTFILE=$HOME/.bash_history
|
#export HISTFILE=$HOME/.bash_history
|
||||||
|
|
||||||
|
# Show date and time in history
|
||||||
|
HISTTIMEFORMAT="%Y-%m-%d %T - "
|
||||||
|
|
||||||
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
|
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
|
||||||
HISTSIZE=10000
|
HISTSIZE=10000
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,6 @@ 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 $(if [ ! $PUID == "" ]; then echo "--uid $PUID"; fi) $(if [ ! $PGID == "" ]; then echo "--gid $PGID"; fi) $USER
|
useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker $(if [ ! $PUID == "" ]; then echo "--uid $PUID"; fi) $(if [ ! $PGID == "" ]; then echo "--gid $PGID"; fi) $USER
|
||||||
chown -R $USER:$USER /home/$USER
|
|
||||||
|
|
||||||
if [ -z "$PASSWORD" ]; then
|
if [ -z "$PASSWORD" ]; then
|
||||||
echo " set default password to \"ubuntu\""
|
echo " set default password to \"ubuntu\""
|
||||||
|
|
@ -112,10 +111,10 @@ fi
|
||||||
#chown $USER:$USER /workspace/.c9
|
#chown $USER:$USER /workspace/.c9
|
||||||
|
|
||||||
|
|
||||||
|
chown -R $USER:$USER /home/$USER
|
||||||
|
|
||||||
|
|
||||||
|
sudo -H -u $USER bash -c 'bash /cloud9/user-install.sh' 2>&1> /home/$USER/.cloud9-install.log &
|
||||||
#sudo -H -u $USER bash -c 'bash /cloud9/user-install.sh' 2>&1> /home/$USER/.cloud9-install.log &
|
|
||||||
|
|
||||||
# Only for testing while editing the menu
|
# Only for testing while editing the menu
|
||||||
#chown $USER /usr/share/applications/
|
#chown $USER /usr/share/applications/
|
||||||
|
|
@ -162,4 +161,5 @@ if [ -n "$SEARCHDOMAIN" ]; then
|
||||||
echo "search $SEARCHDOMAIN" >> /etc/resolv.conf
|
echo "search $SEARCHDOMAIN" >> /etc/resolv.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
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
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue