Procházet zdrojové kódy

Remove php.ini memory setting

Girish Ramakrishnan před 7 roky
rodič
revize
baf4f2fa9c
2 změnil soubory, kde provedl 0 přidání a 11 odebrání
  1. 0 2
      Dockerfile
  2. 0 9
      start.sh

+ 0 - 2
Dockerfile

@@ -48,8 +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
 
-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
-
 ADD start.sh /app/code/start.sh
 
 CMD [ "/app/code/start.sh" ]

+ 0 - 9
start.sh

@@ -26,15 +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
-memory_limit_mb=$((memory_limit*2/1024/1024/5)) # we have 5 apache workers
-php_memory_limit=$(echo ${memory_limit_mb} | awk '{ print 2^(int(log($0)/log(2))+1) }') # next power of 2
-
-echo "Setting PHP memory limit to ${php_memory_limit}M"
-cp /etc/php/7.0/apache2/php.ini.orig /run/php.ini
-crudini --set /run/php.ini PHP memory_limit "${php_memory_limit}M"
-
 # Used for wp rewrite
 touch /app/data/htaccess