Merge branch 'master' into bionic-lxqt

2026-08-05 16:12:41 +02:00 · 2019-03-21 09:23:14 +08:00
parent 247c513519 35d0080b79
commit d145ab0f2d
15 changed files with 1673 additions and 1657 deletions
@@ -1,72 +1,101 @@
+# Built with arch: amd64 flavor: lxqt image: ubuntu:18.04 localbuild: tw
+#
 ################################################################################
 # base system
 ################################################################################
-ARG image=ubuntu:18.04
-FROM $image as system

-ARG localbuild
-RUN echo "LOCALBUILD=$localbuild"
-RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://'$localbuild'.archive.ubuntu.com/#' /etc/apt/sources.list; fi
-ENV DEBIAN_FRONTEND=noninteractive
+FROM ubuntu:18.04 as system

-# What apps you would like to be installed
-ARG APPS="vim-tiny net-tools zenity xz-utils firefox chromium-browser"
-ENV APPS=$APPS
-ARG BUILD_DEPS="build-essential software-properties-common"
-ENV BUILD_DEPS=$BUILD_DEPS
+
+
+RUN sed -i 's#http://archive.ubuntu.com/#http://tw.archive.ubuntu.com/#' /etc/apt/sources.list; 
+
+
+# built-in packages
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt update \
+    && apt install -y --no-install-recommends software-properties-common curl apache2-utils \
+    && apt update \
+    && apt install -y --no-install-recommends --allow-unauthenticated \
+        supervisor nginx sudo net-tools zenity xz-utils \
+        dbus-x11 x11-utils alsa-utils \
+        mesa-utils libgl1-mesa-dri \
+    && apt autoclean -y \
+    && apt autoremove -y \
+    && rm -rf /var/lib/apt/lists/*
+# install debs error if combine together
+RUN add-apt-repository -y ppa:fcwu-tw/apps \
+    && apt update \
+    && apt install -y --no-install-recommends --allow-unauthenticated \
+        xvfb x11vnc=0.9.16-1 \
+        vim-tiny 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/*
+ 
+
+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/*
+ 
 # Additional packages require ~600MB
 # libreoffice  pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw

-# python library
-COPY image/usr/local/lib/web/backend/requirements.txt /tmp/
-
-# built-in packages
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends software-properties-common curl apache2-utils \
-    && apt-get update \
-    && add-apt-repository -y ppa:fcwu-tw/apps \
-    && apt-get install -y --no-install-recommends --allow-unauthenticated \
-      $BUILD_DEPS apache2-utils curl supervisor nginx sudo  \
-      dbus-x11 x11-utils alsa-utils \
-      mesa-utils libgl1-mesa-dri \
-      lxqt openbox xvfb x11vnc \
-      gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf arc-theme \
-      ttf-ubuntu-font-family ttf-wqy-zenhei \
-      $APPS \
-    && add-apt-repository -r ppa:fcwu-tw/apps \
-    && dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
-    && apt-get install -y python-dev python-pip \
-    && pip install setuptools wheel && pip install -r /tmp/requirements.txt \
-    && dpkg-query -W -f='${Package}\n' > /tmp/b.txt \
-    && apt-get remove -y python-pip `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
-    && apt-get purge -y --auto-remove $BUILD_DEPS \
-    && apt-get autoclean \
-    && apt-get autoremove \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-
 # tini for subreap
 ARG TINI_VERSION=v0.18.0
-ENV TINI_VERSION=$TINI_VERSION
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-amd64 /bin/tini
 RUN chmod +x /bin/tini

 # ffmpeg
 RUN mkdir -p /usr/local/ffmpeg \
-    && curl -sSL --http1.1 https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1 \
-    && rm -rf /usr/local/ffmpeg/manpages
+    && curl -sSL https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1
+
+# 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 node:8-alpine as builder
+FROM ubuntu:18.04 as builder
+
+
+RUN sed -i 's#http://archive.ubuntu.com/#http://tw.archive.ubuntu.com/#' /etc/apt/sources.list; 
+
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends curl ca-certificates gnupg patch
+
+# nodejs
+RUN curl -sL https://deb.nodesource.com/setup_8.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 install \
-    && yarn build
+    && yarn \
+    && npm run build
+


 ################################################################################