feat: support video mode

.dockerignore

@@ -0,0 +1 @@
+web/node_modules

.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+tags
+cscope*

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "web/static/novnc"]
+	path = web/static/novnc
+	url = https://github.com/novnc/noVNC
+[submodule "web/static/websockify"]
+	path = web/static/websockify
+	url = https://github.com/novnc/websockify

DEVELOPMENT.md

@@ -0,0 +1,20 @@
+# Run in local
+```
+make build
+make run
+```
+
+## develop backend
+```
+make shell
+supervisorctl stop web
+cd /src/image/usr/local/lib/web/backend
+./run.py --debug
+```
+
+## develop frontend
+```
+cd web
+yarn add
+BACKEND=http://127.0.0.1:6080 npm run dev
+```

Dockerfile

@@ -1,31 +1,30 @@
-FROM ubuntu:16.04
-LABEL maintainer="fcwu.tw@gmail.com"
+################################################################################
+# base system
+################################################################################
+FROM ubuntu:16.04 as system
 
-RUN sed -i 's#http://archive.ubuntu.com/#http://tw.archive.ubuntu.com/#' /etc/apt/sources.list
+ARG localbuild
+RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://qnap.dorowu.com/#' /etc/apt/sources.list; fi
 
 # built-in packages
 RUN apt-get update \
     && apt-get install -y --no-install-recommends software-properties-common curl apache2-utils \
     && add-apt-repository ppa:fcwu-tw/apps \
     && apt-get update \
     && apt-get install -y --no-install-recommends --allow-unauthenticated \
-        supervisor \
-        sudo vim-tiny \
-        net-tools \
-        lxde x11vnc xvfb \
-        gtk2-engines-murrine ttf-ubuntu-font-family \
-        libreoffice firefox \
-        fonts-wqy-microhei \
-        language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw \
-        nginx \
-        python-pip python-dev build-essential \
+        supervisor nginx sudo vim-tiny net-tools zenity xz-utils \
+        dbus-x11 x11-utils alsa-utils \
         mesa-utils libgl1-mesa-dri \
-        gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine pinta arc-theme \
-        dbus-x11 x11-utils \
+        lxde x11vnc xvfb \
+        gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
+        firefox chromium-browser \
+        ttf-ubuntu-font-family ttf-wqy-zenhei \
+    && add-apt-repository -r ppa:fcwu-tw/apps \
     && apt-get autoclean \
     && apt-get autoremove \
     && rm -rf /var/lib/apt/lists/*
-
+# Additional packages require ~600MB
+# libreoffice  pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw
 
 # tini for subreap                                   
 ARG TINI_VERSION=v0.9.0
@@ -36,9 +35,57 @@ RUN chmod +x /bin/tini
 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/backend/requirements.txt /tmp/
-RUN pip install setuptools wheel && pip install -r /tmp/requirements.txt
-ADD image /
+# python library
+COPY image/usr/local/lib/web/backend/requirements.txt /tmp/
+RUN apt-get update \
+    && dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
+    && apt-get install -y python-pip python-dev build-essential \
+	&& pip install setuptools wheel && pip install -r /tmp/requirements.txt \
+    && dpkg-query -W -f='${Package}\n' > /tmp/b.txt \
+    && apt-get remove -y `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
+    && apt-get autoclean -y \
+    && apt-get autoremove -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /var/cache/apt/* /tmp/a.txt /tmp/b.txt
+
+
+################################################################################
+# builder
+################################################################################
+FROM ubuntu:16.04 as builder
+
+ARG localbuild
+RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://qnap.dorowu.com/#' /etc/apt/sources.list; fi
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends curl ca-certificates
+
+# nodejs
+RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \
+    && apt-get install -y nodejs
+
+# yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    && apt-get update \
+    && apt-get install -y yarn
+
+# build frontend
+COPY web /src/web
+RUN cd /src/web \
+    && yarn \
+    && npm run build
+
+
+################################################################################
+# merge
+################################################################################
+FROM scratch
+LABEL maintainer="fcwu.tw@gmail.com"
+
+COPY --from=system / /
+COPY --from=builder /src/web/dist/ /usr/local/lib/web/frontend/
+COPY image /
 
 EXPOSE 80
 WORKDIR /root

Makefile

@@ -4,7 +4,7 @@ REPO  ?= dorowu/ubuntu-desktop-lxde-vnc
 TAG   ?= latest
 
 build:
-	docker build -t $(REPO):$(TAG) .
+	docker build -t $(REPO):$(TAG) --build-arg localbuild=1 .
 
 run:
 	docker run --rm \
@@ -13,8 +13,8 @@ run:
 		-e USER=doro -e PASSWORD=mypassword \
 		-e ALSADEV=hw:2,0 \
 		-e SSL_PORT=443 \
-		-e HTTP_PASSWORD=mypassword \
 		-v ${PWD}/ssl:/etc/nginx/ssl \
+		--device /dev/snd \
 		--name ubuntu-desktop-lxde-test \
 		$(REPO):$(TAG)
 

README.md

@@ -72,7 +72,6 @@ The Resolution of virtual desktop adapts browser window size when first connecti
 docker run -p 6080:80 -e RESOLUTION=1920x1080 dorowu/ubuntu-desktop-lxde-vnc
 ```
 
-
 Default Desktop User
 --------------------
 
@@ -82,6 +81,30 @@ The default user is `root`. You may change the user and password respectively by
 docker run -p 6080:80 -e USER=doro -e PASSWORD=password dorowu/ubuntu-desktop-lxde-vnc
 ```
 
+Sound (Preview version and Linux only)
+-------------------
+
+It only works in Linux. 
+
+First of all, insert kernel module `snd-aloop` and specify `2` as the index of sound loop device
+
+```
+sudo modprobe snd-aloop index=2
+```
+
+Start the container
+
+```
+docker run -it --rm -p 6080:80 --device /dev/snd -e ALSADEV=hw:2,0 dorowu/ubuntu-desktop-lxde-vnc
+```
+
+where `--device /dev/snd -e ALSADEV=hw:2,0` means to grant sound device to container and set basic ASLA config to use card 2.
+
+Launch a browser with URL http://127.0.0.1:6080/#/?video, where `video` means to start with video mode. Now you can start Chromium in start menu (Internet -> Chromium Web Browser Sound) and try to play some video.
+
+[![demo](http://img.youtube.com/vi/Kv9FGClP1-k/0.jpg)](http://www.youtube.com/watch?v=Kv9FGClP1-k)
+
+
 Troubleshooting and FAQ
 ==================
 

image/etc/nginx/sites-enabled/default

@@ -10,26 +10,21 @@ server {
     #_HTTP_PASSWORD_#auth_basic "Private Property";
     #_HTTP_PASSWORD_#auth_basic_user_file /etc/nginx/.htpasswd;
 
-	root /usr/share/nginx/html;
+	root /usr/local/lib/web/frontend/;
 	index index.html index.htm;
 
-    location / {
-        try_files $uri @proxy;
-    }
-
-    location = / {
-        try_files $uri @proxy2;
-    }
-
     location ~ ^/api {
-        try_files $uri @proxy2;
+        try_files $uri @api;
     }
 
-    location = /redirect.html {
-        try_files $uri @proxy2;
+    location = /websockify {
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_pass http://127.0.0.1:6081;
     }
 
-    location @proxy2 {
+    location @api {
         proxy_set_header X-Real-IP  $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $host;
@@ -44,11 +39,4 @@ server {
         proxy_pass http://127.0.0.1:6081;
         max_ranges 0;
     }
-
-    location = /websockify {
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_pass http://127.0.0.1:6081;
-    }
 }

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

@@ -14,6 +14,8 @@ directory=/usr/local/lib/web/backend
 command=/usr/local/lib/web/backend/run.py
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
+stderr_logfile=/dev/fd/1
+stderr_logfile_maxbytes=0
 
 [group:x]
 programs=xvfb,wm,lxpanel,pcmanfm,x11vnc,novnc
@@ -48,6 +50,6 @@ command=x11vnc -display :1 -xkb -forever -shared -repeat
 
 [program:novnc]
 priority=25
-directory=/usr/local/lib/novnc/
-command=/usr/local/lib/novnc/utils/launch.sh --listen 6081
+directory=/usr/local/lib/web/frontend/static/novnc
+command=bash /usr/local/lib/web/frontend/static/novnc/utils/launch.sh --listen 6081
 stopasgroup=true

image/root/.asoundrc

@@ -0,0 +1,4 @@
+pcm.loop {
+    type plug
+    slave.pcm "hw:Loopback,2,0"
+}

image/startup.sh

@@ -23,7 +23,8 @@ if [ "$USER" != "root" ]; then
     fi
     HOME=/home/$USER
     echo "$USER:$PASSWORD" | chpasswd
-    cp -r /root/.* ${HOME}
+    cp -r /root/{.gtkrc-2.0,.asoundrc} ${HOME}
+    [ -d "/dev/snd" ] && chgrp -R adm /dev/snd
 fi
 sed -i "s|%USER%|$USER|" /etc/supervisor/conf.d/supervisord.conf
 sed -i "s|%HOME%|$HOME|" /etc/supervisor/conf.d/supervisord.conf
@@ -50,6 +51,10 @@ if [ -n "$HTTP_PASSWORD" ]; then
 	sed -i 's|#_HTTP_PASSWORD_#||' /etc/nginx/sites-enabled/default
 fi
 
+# novnc websockify
+ln -s /usr/local/lib/web/frontend/static/websockify /usr/local/lib/web/frontend/static/novnc/utils/websockify
+chmod +x /usr/local/lib/web/frontend/static/websockify/run
+
 # clearup
 PASSWORD=
 HTTP_PASSWORD=

image/usr/local/bin/chromium-browser-sound.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -z "$ALSADEV" ]; then
+    zenity --error --text "To support audio, please read README.md and run container with --device /dev/snd -e ALSADEV=..."
+    exit 1
+fi
+
+exec /usr/bin/chromium-browser --no-sandbox --alsa-output-device="$ALSADEV" "$@"