diff --git a/Dockerfile b/Dockerfile index 71c22b5..bbcabd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ -FROM ubuntu:14.04.2 +FROM ubuntu:14.04.3 MAINTAINER Doro Wu +# cache +RUN sed -i 's#http://archive.ubuntu.com/#http://qnap.dorowu.com/#' /etc/apt/sources.list + ENV DEBIAN_FRONTEND noninteractive ENV HOME /root @@ -30,6 +33,7 @@ ADD noVNC /noVNC/ ADD nginx.conf /etc/nginx/sites-enabled/default ADD startup.sh / ADD supervisord.conf /etc/supervisor/conf.d/ +ADD doro-lxde-wallpapers /usr/share/doro-lxde-wallpapers/ EXPOSE 6080 WORKDIR /root diff --git a/doro-lxde-wallpapers/bg1.jpg b/doro-lxde-wallpapers/bg1.jpg new file mode 100644 index 0000000..170e1b2 Binary files /dev/null and b/doro-lxde-wallpapers/bg1.jpg differ diff --git a/doro-lxde-wallpapers/bg2.jpg b/doro-lxde-wallpapers/bg2.jpg new file mode 100644 index 0000000..1c38c13 Binary files /dev/null and b/doro-lxde-wallpapers/bg2.jpg differ diff --git a/doro-lxde-wallpapers/bg3.jpg b/doro-lxde-wallpapers/bg3.jpg new file mode 100644 index 0000000..41f8280 Binary files /dev/null and b/doro-lxde-wallpapers/bg3.jpg differ diff --git a/doro-lxde-wallpapers/bg4.jpg b/doro-lxde-wallpapers/bg4.jpg new file mode 100644 index 0000000..2230f60 Binary files /dev/null and b/doro-lxde-wallpapers/bg4.jpg differ diff --git a/doro-lxde-wallpapers/desktop-items-0.conf b/doro-lxde-wallpapers/desktop-items-0.conf new file mode 100644 index 0000000..e61bd49 --- /dev/null +++ b/doro-lxde-wallpapers/desktop-items-0.conf @@ -0,0 +1,18 @@ +[*] +wallpaper_mode=stretch +wallpaper_common=0 +wallpapers_configured=4 +wallpaper0=/usr/share/doro-lxde-wallpapers/bg1.jpg +wallpaper1=/usr/share/doro-lxde-wallpapers/bg2.jpg +wallpaper2=/usr/share/doro-lxde-wallpapers/bg3.jpg +wallpaper3=/usr/share/doro-lxde-wallpapers/bg4.jpg +desktop_bg=#000000 +desktop_fg=#ffffff +desktop_shadow=#000000 +desktop_font=Sans 12 +show_wm_menu=0 +sort=mtime;ascending;mingle; +show_documents=0 +show_trash=0 +show_mounts=0 + diff --git a/startup.sh b/startup.sh index 3580a77..83eb099 100755 --- a/startup.sh +++ b/startup.sh @@ -8,6 +8,8 @@ PASS=ubuntu # echo "Username: ubuntu Password: $PASS" id -u ubuntu &>/dev/null || useradd --create-home --shell /bin/bash --user-group --groups adm,sudo ubuntu echo "ubuntu:$PASS" | chpasswd +sudo -u ubuntu -i bash -c "mkdir -p /home/ubuntu/.config/pcmanfm/LXDE/ \ + && cp /usr/share/doro-lxde-wallpapers/desktop-items-0.conf /home/ubuntu/.config/pcmanfm/LXDE/" cd /web && ./run.py > /var/log/web.log 2>&1 & nginx -c /etc/nginx/nginx.conf