Merge pull request #663 from turbo124/debian

Corrective fixes for new dockerfile
invoiceninja · Nov 29, 2024 · 113c700 · 113c700
2 parents baad65c + b6be06c
commit 113c700
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 32 deletions.
diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -8,45 +8,41 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     gnupg2 \
     gosu \
     supervisor \
+    default-mysql-client \
+    fonts-liberation \
+    fonts-noto-cjk \
+    fonts-noto-cjk-extra \
+    fonts-wqy-microhei \
+    fonts-wqy-zenhei \
+    libasound2 \
+    libatk-bridge2.0-0 \
+    libatk1.0-0 \
+    libatspi2.0-0 \
+    libcups2 \
+    libdbus-1-3 \
+    libdrm2 \
+    libgbm1 \
+    libgtk-3-0 \
+    libnspr4 \
+    libnss3 \
+    libonig-dev \
+    libpng-dev \
+    libwayland-client0 \
+    libxcomposite1 \
+    libxdamage1 \
+    libxfixes3 \
+    libxkbcommon0 \
+    libxml2-dev \
+    libxrandr2 \
+    xdg-utils \
+    xfonts-wqy \
     && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
         mkdir -p /etc/apt/keyrings \
         && curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /etc/apt/keyrings/google.gpg \
         && echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/google.gpg] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
         && apt-get update \
         && apt-get install -y --no-install-recommends google-chrome-stable; \
     fi \
-    && if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
-        apt-get install -y --no-install-recommends \
-            default-mysql-client \
-            fonts-liberation \
-            fonts-noto-cjk \
-            fonts-noto-cjk-extra \
-            fonts-wqy-microhei \
-            fonts-wqy-zenhei \
-            libasound2 \
-            libatk-bridge2.0-0 \
-            libatk1.0-0 \
-            libatspi2.0-0 \
-            libcups2 \
-            libdbus-1-3 \
-            libdrm2 \
-            libgbm1 \
-            libgtk-3-0 \
-            libnspr4 \
-            libnss3 \
-            libonig-dev \
-            libpng-dev \
-            libwayland-client0 \
-            libxcomposite1 \
-            libxdamage1 \
-            libxfixes3 \
-            libxkbcommon0 \
-            libxml2-dev \
-            libxrandr2 \
-            supervisor \
-            xdg-utils \
-            xfonts-wqy; \
-    fi \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/debian/nginx/laravel.conf b/debian/nginx/laravel.conf
@@ -23,6 +23,8 @@ server {
         fastcgi_pass app:9000;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
     }
 
     location ~ /\.(?!well-known).* {