Merge pull request #633 from turbo124/debian

fixes for amd64 builds
2026-01-06 06:27:25 +01:00 · 2024-11-23 08:52:09 +11:00 · 2024-11-23 08:51:42 +11:00 · 2024-11-23 08:44:00 +11:00 · 2024-11-23 08:43:25 +11:00 · 2024-11-23 08:41:54 +11:00
1 changed files with 20 additions and 14 deletions
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -33,16 +33,18 @@ 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 - \
-    && 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/*

@@ -50,16 +52,20 @@ RUN apt-get update && apt-get install -y \
 RUN mkdir -p /var/www/.chrome/chrome-profile \
    && chown -R www-data:www-data /var/www/.chrome \
    && chmod -R 755 /var/www/.chrome \
-    && chown root:root /usr/bin/google-chrome \
-    && chmod 4755 /usr/bin/google-chrome \
-    && chown -R root:root /opt/google/chrome \
-    && chmod -R 755 /opt/google/chrome \
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+        chown root:root /usr/bin/google-chrome \
+        && chmod 4755 /usr/bin/google-chrome \
+        && chown -R root:root /opt/google/chrome \
+        && chmod -R 755 /opt/google/chrome; \
+    fi \
    && chown -R www-data:www-data /var/www

 # Create required directories with proper permissions
 RUN mkdir -p /tmp/chrome \
-    && chown -R www-data:www-data /tmp/chrome \
-    && chmod -R 755 /tmp/chrome
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+        chown -R www-data:www-data /tmp/chrome \
+        && chmod -R 755 /tmp/chrome; \
+    fi
    
 # Copy Install PHP extensions installer
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
Author	SHA1	Message	Date
David Bomba	e83372d437	Merge pull request #633 from turbo124/debian fixes for amd64 builds	2024-11-23 08:52:09 +11:00
David Bomba	22b2f5416a	fixes for amd64 builds	2024-11-23 08:51:42 +11:00
David Bomba	dbb671eeab	Merge pull request #632 from turbo124/debian Fixes for build stages on different architectures.	2024-11-23 08:44:00 +11:00
David Bomba	baf7b2bff7	Conditional builds for google chrome	2024-11-23 08:43:25 +11:00
David Bomba	db7c7de624	Fixes for trailing backslashes	2024-11-23 08:41:54 +11:00