Ver código fonte

Remove php memory_limit setting

Girish Ramakrishnan 7 anos atrás
pai
commit
6222cfc9a1
2 arquivos alterados com 0 adições e 13 exclusões
  1. 0 5
      Dockerfile
  2. 0 8
      start.sh

+ 0 - 5
Dockerfile

@@ -48,11 +48,6 @@ RUN crudini --set /etc/php/7.0/apache2/php.ini PHP upload_max_filesize 500M && \
     crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_probability 1 && \
     crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_divisor 100
 
-# symlink php.ini for adjusting it in start.sh and also link cli php.ini to the same
-RUN mv /etc/php/7.0/apache2/php.ini /etc/php/7.0/apache2/php.ini.orig && \
-    ln -sf /run/php.ini /etc/php/7.0/apache2/php.ini && \
-    rm /etc/php/7.0/cli/php.ini && ln -sf /run/php.ini /etc/php/7.0/cli/php.ini
-
 ADD start.sh cron.sh /app/code/
 
 CMD [ "/app/code/start.sh" ]

+ 0 - 8
start.sh

@@ -26,14 +26,6 @@ sed -e "s/##MYSQL_DATABASE/${MYSQL_DATABASE}/" \
     -e "s/##TABLE_PREFIX/${table_prefix}/" \
     /app/code/wp-config.php.template > /run/wordpress/wp-config.php # sed -i seems to destroy symlink
 
-# Generate php.ini
-memory_limit=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes) # this is the RAM. we have equal amount of swap
-php_memory_limit_mb=$((memory_limit*2/1024/1024)) # we have 5 apache workers
-
-echo "Setting PHP memory limit to ${php_memory_limit_mb}M"
-cp /etc/php/7.0/apache2/php.ini.orig /run/php.ini
-crudini --set /run/php.ini PHP memory_limit "${php_memory_limit_mb}M"
-
 # Used for wp rewrite
 touch /app/data/htaccess