Merge pull request #633 from turbo124/debian

fixes for amd64 builds

.github/workflows/publish-image.yaml

@@ -11,8 +11,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - image: invoiceninja/invoiceninja
-            context: ./alpine/5/
           - image: invoiceninja/invoiceninja-debian
             context: ./debian
 
@@ -70,7 +68,6 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: ${{ matrix.context }}
           build-args: INVOICENINJA_VERSION=${{ steps.prep.outputs.version }}
-          target: prod
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep.outputs.tags }}

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-noto-cjk-extra \
-    fonts-wqy-microhei \  
+    fonts-wqy-microhei \
-    fonts-wqy-zenhei \ 
+    fonts-wqy-zenhei \
-    xfonts-wqy \      
+    xfonts-wqy \
     wget \
     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 \
     && 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 \
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
-    && chmod 4755 /usr/bin/google-chrome \
+        chown root:root /usr/bin/google-chrome \
-    && chown -R root:root /opt/google/chrome \
+        && chmod 4755 /usr/bin/google-chrome \
-    && chmod -R 755 /opt/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 \
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
-    && chmod -R 755 /tmp/chrome
+        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/