refactor: clean code

Author: fcwu

Dockerfile

@@ -4,6 +4,8 @@ MAINTAINER Doro Wu <fcwu.tw@gmail.com>
 ENV DEBIAN_FRONTEND noninteractive
 ENV HOME /home/ubuntu
 
+RUN sed -i 's#http://archive.ubuntu.com/#http://tw.archive.ubuntu.com/#' /etc/apt/sources.list
+
 # built-in packages
 RUN apt-get update \
  && apt-get install -y --force-yes --no-install-recommends software-properties-common curl \
@@ -28,21 +30,15 @@ RUN apt-get update \
  && apt-get autoremove \
  && rm -rf /var/lib/apt/lists/*
 
-ADD web /web/
-RUN pip install setuptools wheel && pip install -r /web/requirements.txt
 
 # tini for subreap 
 ENV TINI_VERSION v0.9.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini
 RUN chmod +x /bin/tini
 
-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/
-ADD gtkrc-2.0 /home/ubuntu/.gtkrc-2.0
+ADD image /
+RUN pip install setuptools wheel && pip install -r /usr/lib/web/requirements.txt
 
-EXPOSE 6080
+EXPOSE 80
 WORKDIR /root
 ENTRYPOINT ["/startup.sh"]

README.md

@@ -1,5 +1,5 @@
 server {
-listen 6080 default_server;
+listen 80 default_server;
 #listen [::]:6080 default_server ipv6only=on;
 
 root /usr/share/nginx/html;

nginx.conf renamed to image/etc/nginx/sites-enabled/default

@@ -24,7 +24,7 @@ redirect_stderr=true
 [program:x11vnc]
 priority=20
 directory=/
-command=x11vnc -display :1 -xkb -forever
+command=x11vnc -display :1 -xkb -forever -shared
 user=root
 autostart=true
 autorestart=true
@@ -34,8 +34,8 @@ redirect_stderr=true
 
 [program:novnc]
 priority=25
-directory=/noVNC
-command=/noVNC/utils/launch.sh --listen 6081
+directory=/usr/lib/noVNC/
+command=/usr/lib/noVNC/utils/launch.sh --listen 6081
 user=root
 autostart=true
 autorestart=true

supervisord.conf renamed to image/etc/supervisor/conf.d/supervisord.conf

@@ -8,9 +8,10 @@ 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
+chown -R ubuntu:ubuntu /home/ubuntu
 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 &
+cd /usr/lib/web && ./run.py > /var/log/web.log 2>&1 &
 nginx -c /etc/nginx/nginx.conf
 exec /bin/tini -- /usr/bin/supervisord -n