From 328e8f1aa112cf7bdb0cd39a019e1928da832adf Mon Sep 17 00:00:00 2001 From: Tobias Stein Date: Mon, 8 Jul 2019 13:06:02 +0200 Subject: [PATCH] Add separate docker file for linux 16.04 Enable dynamic path with environment variable which triggers node js build at container runtime --- Dockerfile | 26 +++------ Dockerfile.18.04 | 117 +++++++++++++++++++++++++++++++++++++++++ image/etc/RenameURL.py | 6 ++- image/etc/install.sh | 8 +++ image/startup.sh | 9 ++++ 5 files changed, 146 insertions(+), 20 deletions(-) create mode 100644 Dockerfile.18.04 create mode 100644 image/etc/install.sh diff --git a/Dockerfile b/Dockerfile index aa7f9ec..52b504a 120000 --- a/Dockerfile +++ b/Dockerfile @@ -4,13 +4,10 @@ # base system ################################################################################ -FROM ubuntu:18.04 as system - - +FROM ubuntu:16.04 as system 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 \ @@ -27,7 +24,7 @@ RUN apt update \ 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 \ + xvfb x11vnc\ vim-tiny firefox chromium-browser ttf-ubuntu-font-family ttf-wqy-zenhei \ && add-apt-repository -r ppa:fcwu-tw/apps \ && apt autoclean -y \ @@ -36,7 +33,7 @@ RUN add-apt-repository -y ppa:fcwu-tw/apps \ 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 \ + lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* @@ -77,10 +74,6 @@ RUN apt-get update \ ################################################################################ # 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 @@ -94,14 +87,14 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && apt-get update \ && apt-get install -y yarn +ARG ABC ENV PREFIX_PATH "/app" +COPY image / + # build frontend COPY web /src/web -RUN cd /src/web \ - && yarn \ - && npm run build - +RUN /etc/install.sh LABEL maintainer="Tobias Stein, fcwu.tw@gmail.com" @@ -110,11 +103,6 @@ RUN mkdir -p /usr/local/lib/web/frontend RUN cp -R /src/web/dist/. /usr/local/lib/web/frontend/ -COPY image / - -# This has to be called in deriving images -RUN python /etc/RenameURL.py - EXPOSE 80 WORKDIR /root ENV HOME=/home/ubuntu \ diff --git a/Dockerfile.18.04 b/Dockerfile.18.04 new file mode 100644 index 0000000..c2ed2d3 --- /dev/null +++ b/Dockerfile.18.04 @@ -0,0 +1,117 @@ +# Built with arch: amd64 flavor: lxde image: ubuntu:18.04 localbuild: 1 +# +################################################################################ +# base system +################################################################################ + +FROM ubuntu:18.04 as system + + + +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 \ + 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/* + + +# 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.18.0 +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini +RUN chmod +x /bin/tini + +# ffmpeg +RUN apt update \ + && apt install -y --no-install-recommends --allow-unauthenticated \ + ffmpeg \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir /usr/local/ffmpeg \ + && ln -s /usr/bin/ffmpeg /usr/local/ffmpeg/ffmpeg + +# 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: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 + +ENV PREFIX_PATH "/app" + +COPY image / + +# build frontend +COPY web /src/web +RUN /etc/install.sh + +LABEL maintainer="Tobias Stein, fcwu.tw@gmail.com" + +# COPY --from=builder /src/web/dist/ /usr/local/lib/web/frontend/ +RUN mkdir -p /usr/local/lib/web/frontend + +RUN cp -R /src/web/dist/. /usr/local/lib/web/frontend/ + +EXPOSE 80 +WORKDIR /root +ENV HOME=/home/ubuntu \ + SHELL=/bin/bash +HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://127.0.0.1:6079/api/health +ENTRYPOINT ["/startup.sh"] diff --git a/image/etc/RenameURL.py b/image/etc/RenameURL.py index a16f79b..0494bec 100644 --- a/image/etc/RenameURL.py +++ b/image/etc/RenameURL.py @@ -1,7 +1,11 @@ import os, fnmatch toFind = "/app" -toReplace = os.getenv("PREFIX_PATH", "/app") +toReplace = os.getenv("PREFIX_PATH") + +if (toReplace is None): + print("No path given by environment variable.") + exit() print("using path {0} ...".format(toReplace)) diff --git a/image/etc/install.sh b/image/etc/install.sh new file mode 100644 index 0000000..2a0f42e --- /dev/null +++ b/image/etc/install.sh @@ -0,0 +1,8 @@ +#!/bin/bash +echo 'Building Node.js project...' +cd /src/web \ + && yarn \ + && npm run build + +cp -R /src/web/dist/. /usr/local/lib/web/frontend/ +echo 'Build finished.' \ No newline at end of file diff --git a/image/startup.sh b/image/startup.sh index 539490a..33763a2 100755 --- a/image/startup.sh +++ b/image/startup.sh @@ -67,4 +67,13 @@ chmod +x "/usr/local/lib/web/frontend$PREFIX_PATH/static/websockify/run" PASSWORD= HTTP_PASSWORD= +# dynamic prefix path renaming +# if [ -n "$DYNAMIC_PREFIX_PATH" ]; then +# PREFIX_PATH="$DYNAMIC_PREFIX_PATH" +# echo "DYNAMIC_PREFIX_PATH: $PREFIX_PATH" +# python /etc/RenameURL.py +# /etc/install.sh +# cat /etc/nginx/sites-enabled/default +# fi + exec /bin/tini -- /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf