Merge pull request #170 from andrewnicols/renameStandardIni

Rename moodle ini to support easier lexical sorting

Author: stronk7

.github/workflows/test_buildx_and_publish.yml

@@ -29,6 +29,8 @@ jobs:
               -v $PWD/tests/docker-entrypoint.d:/docker-entrypoint.d \
               -e PHP_INI-memory_limit=256M \
               -e PHP_INI-apc.enabled=0 \
+              -e PHP_INI-apc.enable_cli=0 \
+              -e PHP_INI-pcov.enabled=1 \
               moodle-php-apache
           docker exec test0 php /var/www/html/test.php
           docker exec test0 php /var/www/html/check-ini.php

root/tmp/setup/php-extensions.sh

@@ -67,12 +67,12 @@ docker-php-ext-install -j$(nproc) ldap
 pecl install apcu igbinary memcached pcov redis solr timezonedb uuid xmlrpc-beta
 docker-php-ext-enable apcu igbinary memcached pcov redis solr timezonedb uuid xmlrpc
 
-echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
+echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/10-docker-php-ext-apcu.ini
 
-echo "pcov.enabled=0" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
-echo "pcov.exclude='~\/(tests|coverage|vendor|node_modules)\/~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
-echo "pcov.directory=." >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
-echo "pcov.initial.files=1024" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+echo "pcov.enabled=0" >> /usr/local/etc/php/conf.d/10-docker-php-ext-pcov.ini
+echo "pcov.exclude='~\/(tests|coverage|vendor|node_modules)\/~'" >> /usr/local/etc/php/conf.d/10-docker-php-ext-pcov.ini
+echo "pcov.directory=." >> /usr/local/etc/php/conf.d/10-docker-php-ext-pcov.ini
+echo "pcov.initial.files=1024" >> /usr/local/etc/php/conf.d/10-docker-php-ext-pcov.ini
 
 # Keep our image size down..
 pecl clear-cache

root/usr/local/etc/php/conf.d/docker-php-moodle.ini renamed to root/usr/local/etc/php/conf.d/10-docker-php-moodle.ini

@@ -17,11 +17,23 @@
     $message[] = "apc.enabled is not Off (0): ({$apcenabled})";
 }
 
+$apcenabledcli = ini_get('apc.enabled_cli');
+if (!empty($apcenabledcli)) {
+    $allokay = false;
+    $message[] = "apc.enabled_cli is not Off (0): ({$apcenabledcli})";
+}
+
 if ($memorylimit !== '256M') {
     $allokay = false;
     $message[] = "Memory limit not set to 256M: ({$memorylimit})";
 }
 
+$pcovenabled = ini_get('pcov.enabled');
+if (empty($pcovenabled)) {
+    $allokay = false;
+    $message[] = "pcov.enabled is not On (1): ({$pcovenabled})";
+}
+
 if (php_sapi_name() === 'cli') {
     if ($allokay) {
         echo "OK\n";