fix: mask tight encoding for armhf (bug #98)

This commit is contained in:
Doro Wu 2019-02-24 21:25:35 +08:00
parent 0adc0da8e8
commit f1d608d92c
No known key found for this signature in database
GPG key ID: 3F2E4F1C2D4A1AA4
2 changed files with 7 additions and 5 deletions

View file

@ -17,7 +17,7 @@ RUN apt-get update \
supervisor nginx sudo vim-tiny net-tools zenity xz-utils \
dbus-x11 x11-utils alsa-utils \
mesa-utils libgl1-mesa-dri \
lxde xvfb x11vnc=0.9.16 \
lxde xvfb x11vnc=0.9.16-1 \
gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
firefox chromium-browser \
ttf-ubuntu-font-family ttf-wqy-zenhei \

View file

@ -18,16 +18,17 @@ RUN apt update \
supervisor nginx sudo vim-tiny net-tools zenity xz-utils \
dbus-x11 x11-utils alsa-utils \
mesa-utils libgl1-mesa-dri \
&& add-apt-repository -r ppa:fcwu-tw/apps \
&& apt autoclean -y \
&& apt autoremove -y \
&& rm -rf /var/lib/apt/lists/*
# install debs error if combine together
RUN apt update \
RUN add-apt-repository -y ppa:fcwu-tw/apps \
&& apt update \
&& apt install -y --no-install-recommends --allow-unauthenticated \
lxde xvfb x11vnc \
lxde xvfb x11vnc=0.9.16-1 \
firefox chromium-browser \
ttf-ubuntu-font-family ttf-wqy-zenhei \
&& add-apt-repository -r ppa:fcwu-tw/apps \
&& apt autoclean -y \
&& apt autoremove -y \
&& rm -rf /var/lib/apt/lists/*
@ -72,7 +73,7 @@ ARG localbuild
RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://tw.archive.ubuntu.com/#' /etc/apt/sources.list; fi
RUN apt-get update \
&& apt-get install -y --no-install-recommends curl ca-certificates gnupg
&& apt-get install -y --no-install-recommends curl ca-certificates gnupg patch
# nodejs
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \
@ -89,6 +90,7 @@ COPY web /src/web
RUN cd /src/web \
&& yarn \
&& npm run build
RUN cd /src/web/dist/static/novnc && patch -p0 < /src/web/novnc-armhf-1.patch
################################################################################