refactor: code structure

1. move folders from /usr/* to /usr/local/*
2. supervisord controls everything

Author: dorowu-qnap

Dockerfile

@@ -34,7 +34,11 @@ ARG TINI_VERSION=v0.9.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini
 RUN chmod +x /bin/tini
 
-ADD image/usr/lib/web/requirements.txt /tmp/
+# ffmpeg
+RUN mkdir -p /usr/local/ffmpeg \
+    && curl -sSL https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1
+
+ADD image/usr/local/lib/web/requirements.txt /tmp/
 RUN pip install setuptools wheel && pip install -r /tmp/requirements.txt
 ADD image /
 

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

@@ -1,68 +1,59 @@
+[supervisord]
+redirect_stderr=true
+stopsignal=QUIT
+autorestart=true
+directory=/root
+
+[program:nginx]
+priority=10
+command=nginx -c /etc/nginx/nginx.conf -g 'daemon off;'
+stdout_logfile=/var/log/nginx.log
+
+[program:web]
+priority=10
+directory=/usr/local/lib/web
+command=/usr/local/lib/web/run.py
+stdout_logfile=/var/log/web.log
+
+[group:x]
+programs=xvfb,wm,lxpanel,pcmanfm,x11vnc,novnc
+
 [program:xvfb]
 priority=10
-directory=/
-command=/usr/bin/Xvfb :1 -screen 0 1024x768x16
-user=root
-autostart=true
-autorestart=true
+command=/usr/local/bin/xvfb.sh
 stopsignal=KILL
 stdout_logfile=/var/log/xvfb.log
-redirect_stderr=true
 
 [program:wm]
 priority=15
-directory=/root
 command=/usr/bin/openbox
-user=root
-autostart=true
-autorestart=true
-stopsignal=QUIT
 environment=DISPLAY=":1",HOME="/root",USER="root"
 stdout_logfile=/var/log/openbox.log
-redirect_stderr=true
 
 [program:lxpanel]
 priority=15
 directory=%HOME%
 command=/usr/bin/lxpanel --profile LXDE
 user=%USER%
-autostart=true
-autorestart=true
-stopsignal=QUIT
 environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%"
 stdout_logfile=/var/log/lxpanel.log
-redirect_stderr=true
 
 [program:pcmanfm]
 priority=15
 directory=%HOME%
 command=/usr/bin/pcmanfm --desktop --profile LXDE
 user=%USER%
-autostart=true
-autorestart=true
-stopsignal=QUIT
 environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%"
 stdout_logfile=/var/log/pcmanfm.log
 
 [program:x11vnc]
 priority=20
-directory=/
 command=x11vnc -display :1 -xkb -forever -shared -repeat
-user=root
-autostart=true
-autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/x11vnc.log
-redirect_stderr=true
 
 [program:novnc]
 priority=25
-directory=/usr/lib/noVNC/
-command=/usr/lib/noVNC/utils/launch.sh --listen 6081
-user=root
-autostart=true
-autorestart=true
-stopsignal=QUIT
+directory=/usr/local/lib/novnc/
+command=/usr/local/lib/novnc/utils/launch.sh --listen 6081
 stdout_logfile=/var/log/novnc.log
-redirect_stderr=true
 stopasgroup=true

image/startup.sh

@@ -22,19 +22,17 @@ if [ "$USER" != "root" ]; then
     fi
     HOME=/home/$USER
     echo "$USER:$PASSWORD" | chpasswd
-    cp -r /root/.gtkrc-2.0 ${HOME}
+    cp -r /root/.* ${HOME}
 fi
 sed -i "s|%USER%|$USER|" /etc/supervisor/conf.d/supervisord.conf
 sed -i "s|%HOME%|$HOME|" /etc/supervisor/conf.d/supervisord.conf
 
 # home folder
 mkdir -p $HOME/.config/pcmanfm/LXDE/
-ln -sf /usr/share/doro-lxde-wallpapers/desktop-items-0.conf $HOME/.config/pcmanfm/LXDE/
+ln -sf /usr/local/share/doro-lxde-wallpapers/desktop-items-0.conf $HOME/.config/pcmanfm/LXDE/
 chown -R $USER:$USER $HOME
 
 # clearup
 PASSWORD=
 
-cd /usr/lib/web && ./run.py 2>&1 &
-nginx -c /etc/nginx/nginx.conf
 exec /bin/tini -- /usr/bin/supervisord -n

image/usr/local/bin/xvfb.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/Xvfb :1 -screen 0 1024x768x16

image/usr/lib/noVNC/.gitlastcommit renamed to image/usr/local/lib/novnc/.gitlastcommit

@@ -115,14 +115,14 @@ def redirectme():
     # sed
     cmd = (
         'sed -i \'s#'
-        '^command=/usr/bin/Xvfb.*$'
+        '^exec /usr/bin/Xvfb.*$'
         '#'
-        'command=/usr/bin/Xvfb :1 -screen 0 {width}x{height}x16'
-        '#\' /etc/supervisor/conf.d/supervisord.conf'
+        'exec /usr/bin/Xvfb :1 -screen 0 {width}x{height}x16'
+        '#\' /usr/local/bin/xvfb.sh'
     ).format(**env),
     subprocess.check_call(cmd, shell=True)
     # supervisorctrl reload
-    subprocess.check_call(['supervisorctl', 'reload'])
+    subprocess.check_call(['supervisorctl', 'restart', 'x:'])
 
     # check all running
     for i in range(40):

image/usr/lib/noVNC/.npmignore renamed to image/usr/local/lib/novnc/.npmignore

@@ -2,10 +2,10 @@
 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
+wallpaper0=/usr/local/share/doro-lxde-wallpapers/bg1.jpg
+wallpaper1=/usr/local/share/doro-lxde-wallpapers/bg2.jpg
+wallpaper2=/usr/local/share/doro-lxde-wallpapers/bg3.jpg
+wallpaper3=/usr/local/share/doro-lxde-wallpapers/bg4.jpg
 desktop_bg=#000000
 desktop_fg=#ffffff
 desktop_shadow=#000000