mirror of
https://github.com/invoiceninja/dockerfiles.git
synced 2025-12-31 19:47:25 +01:00
Corrective fixes for new dockerfile
This commit is contained in:
60
debian/Dockerfile
vendored
60
debian/Dockerfile
vendored
@@ -8,6 +8,34 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
gnupg2 \
|
gnupg2 \
|
||||||
gosu \
|
gosu \
|
||||||
supervisor \
|
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 \
|
&& if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
|
||||||
mkdir -p /etc/apt/keyrings \
|
mkdir -p /etc/apt/keyrings \
|
||||||
&& curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /etc/apt/keyrings/google.gpg \
|
&& curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /etc/apt/keyrings/google.gpg \
|
||||||
@@ -15,38 +43,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends google-chrome-stable; \
|
&& apt-get install -y --no-install-recommends google-chrome-stable; \
|
||||||
fi \
|
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 \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|||||||
2
debian/nginx/laravel.conf
vendored
2
debian/nginx/laravel.conf
vendored
@@ -23,6 +23,8 @@ server {
|
|||||||
fastcgi_pass app:9000;
|
fastcgi_pass app:9000;
|
||||||
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
|
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
|
||||||
include fastcgi_params;
|
include fastcgi_params;
|
||||||
|
fastcgi_buffer_size 16k;
|
||||||
|
fastcgi_buffers 4 16k;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ /\.(?!well-known).* {
|
location ~ /\.(?!well-known).* {
|
||||||
|
|||||||
Reference in New Issue
Block a user