Yippie/docker-ubuntu
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

feat: add ubuntu 20.04 arm64

Browse source
This commit is contained in:
Doro Wu 2021-03-03 22:43:44 +08:00
parent 75c5f5549f
commit 8d323eca97
No known key found for this signature in database
GPG key ID: 3F2E4F1C2D4A1AA4
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Dockerfile.arm64
View file

@ -5,9 +5,9 @@
################################################################################ ################################################################################
# qemu helper for arm build # qemu helper for arm build
FROM ubuntu:18.04 as amd64 FROM ubuntu:20.04 as amd64
RUN apt update && apt install -y qemu-user-static RUN apt update && apt install -y qemu-user-static
FROM arm64v8/ubuntu:18.04 as system FROM arm64v8/ubuntu:20.04 as system
COPY --from=amd64 /usr/bin/qemu-aarch64-static /usr/bin/ COPY --from=amd64 /usr/bin/qemu-aarch64-static /usr/bin/
@ -28,10 +28,9 @@ RUN apt update \
&& apt autoremove -y \ && apt autoremove -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# install debs error if combine together # install debs error if combine together
RUN add-apt-repository -y ppa:fcwu-tw/apps \ RUN apt update \
&& apt update \
&& apt install -y --no-install-recommends --allow-unauthenticated \ && apt install -y --no-install-recommends --allow-unauthenticated \
xvfb x11vnc=0.9.13-3 x11vnc-data=0.9.13-3 \ xvfb x11vnc \
vim-tiny firefox chromium-browser ttf-ubuntu-font-family ttf-wqy-zenhei \ vim-tiny firefox chromium-browser ttf-ubuntu-font-family ttf-wqy-zenhei \
&& add-apt-repository -r ppa:fcwu-tw/apps \ && add-apt-repository -r ppa:fcwu-tw/apps \
&& apt autoclean -y \ && apt autoclean -y \
@ -55,15 +54,20 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-arm64
RUN chmod +x /bin/tini RUN chmod +x /bin/tini
# ffmpeg # ffmpeg
RUN mkdir -p /usr/local/ffmpeg \ RUN apt update \
&& curl -sSL https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1 && 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 # python library
COPY rootfs/usr/local/lib/web/backend/requirements.txt /tmp/ COPY rootfs/usr/local/lib/web/backend/requirements.txt /tmp/
RUN apt-get update \ RUN apt-get update \
&& dpkg-query -W -f='${Package}\n' > /tmp/a.txt \ && dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
&& apt-get install -y python-pip python-dev build-essential \ && apt-get install -y python3-pip python3-dev build-essential \
&& pip install setuptools wheel && pip install -r /tmp/requirements.txt \ && 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 \ && 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 remove -y `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
&& apt-get autoclean -y \ && apt-get autoclean -y \
@ -75,7 +79,7 @@ RUN apt-get update \
################################################################################ ################################################################################
# builder # builder
################################################################################ ################################################################################
FROM ubuntu:18.04 as builder FROM ubuntu:20.04 as builder
RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list;
@ -98,7 +102,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
COPY web /src/web COPY web /src/web
RUN cd /src/web \ RUN cd /src/web \
&& yarn \ && yarn \
&& npm run build && yarn build
RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui.js RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui.js