From d58b5c2f22866fcd66d39d3989b368ff72c5e863 Mon Sep 17 00:00:00 2001
From: Doro Wu <fcwu.tw@gmail.com>
Date: Wed, 22 Jul 2020 22:45:48 +0800
Subject: [PATCH] fix(jinja): support LXDE and Ubuntu 20.04 only

---
 Dockerfile.j2                                 | 54 +++++++------------
 Makefile                                      |  4 +-
 .../local/lib/web/backend/requirements.txt    |  1 -
 3 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/Dockerfile.j2 b/Dockerfile.j2
index 5c9039a..7b339d0 100644
--- a/Dockerfile.j2
+++ b/Dockerfile.j2
@@ -27,53 +27,39 @@ RUN apt update \
     && apt autoclean -y \
     && apt autoremove -y \
     && rm -rf /var/lib/apt/lists/*
-{%if image == "ubuntu:18.04"%}
-ENV X11VNC_VERSION=0.9.16-1
-{%else%}
-ENV X11VNC_VERSION=0.9.14-1*
-# arc-theme
-RUN add-apt-repository -y ppa:noobslab/themes
-{%endif%}
 # install debs error if combine together
-RUN add-apt-repository -y ppa:fcwu-tw/apps \
-    && apt update \
+RUN apt update \
     && apt install -y --no-install-recommends --allow-unauthenticated \
-        xvfb x11vnc=$X11VNC_VERSION \
-        {%for package in addon_packages%}{{package}} {%endfor%} \
-    && add-apt-repository -r ppa:fcwu-tw/apps \
+        xvfb x11vnc \
+        vim-tiny firefox ttf-ubuntu-font-family ttf-wqy-zenhei  \
     && apt autoclean -y \
     && apt autoremove -y \
     && rm -rf /var/lib/apt/lists/*
+RUN apt update \
+    && apt install -y gpg-agent \
+    && curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
+    && (dpkg -i ./google-chrome-stable_current_amd64.deb || apt-get install -fy) \
+    && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add \
+    && rm google-chrome-stable_current_amd64.deb \
+    && rm -rf /var/lib/apt/lists/*
 {%if desktop == "lxde" %}
+{%endif%}
+{%if desktop == "lxqt" %}
+{%endif%}
+{%if desktop == "xfce4" %}
+{%endif%}
 RUN apt update \
     && apt install -y --no-install-recommends --allow-unauthenticated \
         lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
     && apt autoclean -y \
     && apt autoremove -y \
     && rm -rf /var/lib/apt/lists/*
-{%endif%}
-{%if desktop == "lxqt" %}
-RUN apt update \
-    && apt install -y --no-install-recommends --allow-unauthenticated \
-        lxqt openbox gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf arc-theme \
-    && apt autoclean -y \
-    && apt autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
-{%endif%}
-{%if desktop == "xfce4" %}
-RUN apt update \
-    && apt install -y --no-install-recommends --allow-unauthenticated \
-        xubuntu-desktop \
-    && apt autoclean -y \
-    && apt autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
-{%endif%}
 # 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
+# tini to fix subreap
 ARG TINI_VERSION=v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-{{arch}} /bin/tini
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini
 RUN chmod +x /bin/tini
 
 # ffmpeg
@@ -84,13 +70,13 @@ RUN apt update \
     && mkdir /usr/local/ffmpeg \
     && ln -s /usr/bin/ffmpeg /usr/local/ffmpeg/ffmpeg
 
-
 # python library
 COPY rootfs/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 \
+    && apt-get install -y python3-pip python3-dev build-essential \
+	&& pip3 install setuptools wheel && pip3 install -r /tmp/requirements.txt \
+    && ln -s /usr/bin/python3 /usr/local/bin/python \
     && 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 \
diff --git a/Makefile b/Makefile
index ec0e2ac..d509439 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ REPO  ?= dorowu/ubuntu-desktop-lxde-vnc
 TAG   ?= latest
 # you can choose other base image versions
 IMAGE ?= ubuntu:20.04
+# IMAGE ?= nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
 # choose from supported flavors (see available ones in ./flavors/*.yml)
 FLAVOR ?= lxde
 # armhf or amd64
@@ -18,7 +19,7 @@ build: $(templates)
 	docker build -t $(REPO):$(TAG) .
 
 # Test run the container
-#  the local dir will be mounted under /src read-only
+# the local dir will be mounted under /src read-only
 run:
 	docker run --privileged --rm \
 		-p 6080:80 -p 6081:443 \
@@ -27,6 +28,7 @@ run:
 		-e ALSADEV=hw:2,0 \
 		-e SSL_PORT=443 \
 		-e RELATIVE_URL_ROOT=approot \
+		-e OPENBOX_ARGS="--startup /usr/bin/galculator" \
 		-v ${PWD}/ssl:/etc/nginx/ssl \
 		--device /dev/snd \
 		--name ubuntu-desktop-lxde-test \
diff --git a/rootfs/usr/local/lib/web/backend/requirements.txt b/rootfs/usr/local/lib/web/backend/requirements.txt
index 48dbc5d..7f5e2a5 100644
--- a/rootfs/usr/local/lib/web/backend/requirements.txt
+++ b/rootfs/usr/local/lib/web/backend/requirements.txt
@@ -14,7 +14,6 @@ MarkupSafe==1.1.1
 meld3==2.0.0
 requests==2.22.0
 six==1.12.0
-supervisor==4.1.0
 urllib3==1.25.6
 websocket-client==0.47.0
 Werkzeug==0.16.0