From 53d202398d54100ccfd5c9146f24150f76ce2b31 Mon Sep 17 00:00:00 2001 From: hoellen Date: Fri, 24 Mar 2017 08:26:44 +0100 Subject: [PATCH] fix memory limit for occ command (#159) --- nextcloud/11.0/occ | 2 +- nextcloud/11.0/run.sh | 3 ++- nextcloud/daily/occ | 2 +- nextcloud/daily/run.sh | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nextcloud/11.0/occ b/nextcloud/11.0/occ index a766ef6..bffa67a 100644 --- a/nextcloud/11.0/occ +++ b/nextcloud/11.0/occ @@ -1,2 +1,2 @@ #!/bin/sh -su-exec $UID:$GID php7 /nextcloud/occ $@ +su-exec $UID:$GID php7 -d memory_limit= -f /nextcloud/occ $@ diff --git a/nextcloud/11.0/run.sh b/nextcloud/11.0/run.sh index 86493c1..79c079b 100644 --- a/nextcloud/11.0/run.sh +++ b/nextcloud/11.0/run.sh @@ -5,7 +5,8 @@ sed -i -e "s//$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph -e "s//$APC_SHM_SIZE/g" /etc/php7/conf.d/apcu.ini \ -e "s//$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \ -e "s//$CRON_MEMORY_LIMIT/g" /etc/s6.d/cron/run \ - -e "s//$CRON_PERIOD/g" /etc/s6.d/cron/run + -e "s//$CRON_PERIOD/g" /etc/s6.d/cron/run \ + -e "s//$MEMORY_LIMIT/g" /usr/local/bin/occ # Put the configuration and apps into volumes ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null diff --git a/nextcloud/daily/occ b/nextcloud/daily/occ index a766ef6..bffa67a 100644 --- a/nextcloud/daily/occ +++ b/nextcloud/daily/occ @@ -1,2 +1,2 @@ #!/bin/sh -su-exec $UID:$GID php7 /nextcloud/occ $@ +su-exec $UID:$GID php7 -d memory_limit= -f /nextcloud/occ $@ diff --git a/nextcloud/daily/run.sh b/nextcloud/daily/run.sh index 86493c1..79c079b 100644 --- a/nextcloud/daily/run.sh +++ b/nextcloud/daily/run.sh @@ -5,7 +5,8 @@ sed -i -e "s//$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph -e "s//$APC_SHM_SIZE/g" /etc/php7/conf.d/apcu.ini \ -e "s//$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \ -e "s//$CRON_MEMORY_LIMIT/g" /etc/s6.d/cron/run \ - -e "s//$CRON_PERIOD/g" /etc/s6.d/cron/run + -e "s//$CRON_PERIOD/g" /etc/s6.d/cron/run \ + -e "s//$MEMORY_LIMIT/g" /usr/local/bin/occ # Put the configuration and apps into volumes ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null