From db7c7de6248bc452869de88b029887c4e3a7d350 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 23 Nov 2024 08:41:54 +1100 Subject: [PATCH 1/2] Fixes for trailing backslashes --- debian/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 27d98f8..110f813 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -33,10 +33,10 @@ RUN apt-get update && apt-get install -y \ libxrandr2 \ xdg-utils \ fonts-noto-cjk \ - fonts-noto-cjk-extra \ - fonts-wqy-microhei \ - fonts-wqy-zenhei \ - xfonts-wqy \ + fonts-noto-cjk-extra \ + fonts-wqy-microhei \ + fonts-wqy-zenhei \ + xfonts-wqy \ wget \ gnupg2 \ && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ From baf7b2bff7a152355ec874019eae92632c6335b2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 23 Nov 2024 08:43:25 +1100 Subject: [PATCH 2/2] Conditional builds for google chrome --- debian/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 110f813..8a76ed4 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -39,10 +39,12 @@ RUN apt-get update && apt-get install -y \ xfonts-wqy \ wget \ gnupg2 \ - && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ - && apt-get update \ - && apt-get install -y google-chrome-stable \ + && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ + && apt-get update \ + && apt-get install -y google-chrome-stable; \ + fi \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*