Compare commits

..

No commits in common. "58fe310d580c78c2ad85e0513f931bf20ea68477" and "99fccde008864a4711808b891e9bb4cec5a41cb4" have entirely different histories.

6 changed files with 1819 additions and 24 deletions

View File

@ -1,14 +1,14 @@
services: services:
fpm: nextcloud:
build: build:
context: . context: .
dockerfile: fpm.Dockerfile dockerfile: nextcloud.Dockerfile
args: args:
NEXTCLOUD_VERSION: ${NEXTCLOUD_VERSION} NEXTCLOUD_VERSION: ${NEXTCLOUD_VERSION}
NEXTCLOUD_URL: ${NEXTCLOUD_URL} NEXTCLOUD_URL: ${NEXTCLOUD_URL}
NEXTCLOUD_FILENAME: ${NEXTCLOUD_FILENAME} NEXTCLOUD_FILENAME: ${NEXTCLOUD_FILENAME}
hostname: nextcloud hostname: nextcloud
image: git.shihaam.dev/dockerfiles/nextcloud/fpm:${NEXTCLOUD_VERSION} image: git.shihaam.dev/dockerfiles/nextcloud/nextcloud:${NEXTCLOUD_VERSION}
nginx: nginx:
build: build:
context: . context: .

View File

@ -9,7 +9,6 @@ else
fi fi
if [ -z "$(ls -A /var/www/html/apps)" ]; then if [ -z "$(ls -A /var/www/html/apps)" ]; then
mkdir -p /var/www/html/apps/
cp -r /var/www/default_apps/* /var/www/html/apps/ cp -r /var/www/default_apps/* /var/www/html/apps/
echo "Copied default apps to /var/www/html/apps because it was empty." echo "Copied default apps to /var/www/html/apps because it was empty."
else else

View File

@ -28,7 +28,7 @@ RUN mv /var/www/html/config/config.sample.php /var/www/default_config.sample.php
# copy php config # copy php config
COPY php.ini /usr/local/etc/php/php.ini COPY php.ini /usr/local/etc/php/php.ini
COPY php-fpm.conf /usr/local/etc/php-fpm.conf
# copy and setup entrypoint # copy and setup entrypoint
COPY entrypoint.sh /usr/local/bin/entrypoint.sh COPY entrypoint.sh /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

View File

@ -30,7 +30,7 @@ server {
# set max upload size and increase upload timeout: # set max upload size and increase upload timeout:
client_max_body_size 4G; client_max_body_size 4G;
client_body_timeout 600s; client_body_timeout 600s;
fastcgi_buffers 64 16K; fastcgi_buffers 64 4K;
fastcgi_read_timeout 300; fastcgi_read_timeout 300;
fastcgi_send_timeout 300; fastcgi_send_timeout 300;
fastcgi_connect_timeout 300; fastcgi_connect_timeout 300;

View File

@ -1,16 +0,0 @@
# Increase max execution time
max_execution_time = 300
# Increase process manager settings
pm = dynamic
pm.max_children = 50
pm.start_servers = 5
pm.min_spare_servers = 5
pm.max_spare_servers = 35
pm.max_requests = 500
# Increase request timeout
request_terminate_timeout = 300s
[global]
include=etc/php-fpm.d/*.conf

File diff suppressed because it is too large Load Diff