Merge pull request #632 from turbo124/debian

Fixes for build stages on different architectures.
This commit is contained in:
David Bomba
2024-11-23 08:44:00 +11:00
committed by GitHub

18
debian/Dockerfile vendored
View File

@@ -33,16 +33,18 @@ RUN apt-get update && apt-get install -y \
libxrandr2 \ libxrandr2 \
xdg-utils \ xdg-utils \
fonts-noto-cjk \ fonts-noto-cjk \
fonts-noto-cjk-extra \ fonts-noto-cjk-extra \
fonts-wqy-microhei \ fonts-wqy-microhei \
fonts-wqy-zenhei \ fonts-wqy-zenhei \
xfonts-wqy \ xfonts-wqy \
wget \ wget \
gnupg2 \ gnupg2 \
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& apt-get update \ && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
&& apt-get install -y google-chrome-stable \ && apt-get update \
&& apt-get install -y google-chrome-stable; \
fi \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*