diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 4169cc6..409db20 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -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 \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 54f5dd5..92e2b20 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -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 ################################################################################