Merge pull request #293 from ollyollyollyltd/fix/explicit-php-versioning

Fix/explicit php versioning

Author: moufmouf

extensions/core/disable_all.sh

@@ -8,6 +8,6 @@ for ext in */; do \
     if compgen -G "/etc/php/${PHP_VERSION}/cli/conf.d/*-$ext_no_slash.ini" > /dev/null; then
         echo "***************** Disabling $ext_no_slash ******************"
         #rm -f /etc/php/${PHP_VERSION}/cli/conf.d/*-$ext_no_slash.ini
-        phpdismod $ext_no_slash
+        phpdismod -v $PHP_VERSION $ext_no_slash
     fi
 done

extensions/core/docker-install.sh

@@ -54,24 +54,24 @@ fi
 
 if [ -n "$EXTENSION" ]; then
     # Let's perform a test
-    phpenmod $EXTENSION
+    phpenmod -v $PHP_VERSION $EXTENSION
     /usr/bin/real_php -m | grep "${PHP_EXT_PHP_NAME:-${PHP_EXT_NAME:-$EXTENSION}}"
     # Check that there is no output on STDERR when starting php:
     OUTPUT=`/usr/bin/real_php -r "echo '';" 2>&1`
     [[ "$OUTPUT" == "" ]]
     # And now, let's disable it!
-    phpdismod $EXTENSION
+    phpdismod -v $PHP_VERSION $EXTENSION
 fi
 
 if [ -n "$PECL_EXTENSION" ]; then
     # Let's perform a test
-    PHP_EXTENSIONS="${PHP_EXT_NAME:-$PECL_EXTENSION}" /usr/bin/real_php /usr/local/bin/setup_extensions.php | bash
+    PHP_EXTENSIONS="${PHP_EXT_NAME:-$PECL_EXTENSION}" PHP_VERSION="${PHP_VERSION}" /usr/bin/real_php /usr/local/bin/setup_extensions.php | bash
     PHP_EXTENSIONS="${PHP_EXT_NAME:-$PECL_EXTENSION}" /usr/bin/real_php /usr/local/bin/generate_conf.php > /etc/php/${PHP_VERSION}/cli/conf.d/testextension.ini
 
     /usr/bin/real_php -m | grep "${PHP_EXT_PHP_NAME:-${PHP_EXT_NAME:-$PECL_EXTENSION}}"
     # Check that there is no output on STDERR when starting php:
     OUTPUT=`/usr/bin/real_php -r "echo '';" 2>&1`
     [[ "$OUTPUT" == "" ]]
-    PHP_EXTENSIONS="" /usr/bin/real_php /usr/local/bin/setup_extensions.php | bash
+    PHP_EXTENSIONS="" PHP_VERSION="${PHP_VERSION}" /usr/bin/real_php /usr/local/bin/setup_extensions.php | bash
     rm /etc/php/${PHP_VERSION}/cli/conf.d/testextension.ini
 fi

extensions/core/memcached/install.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 set -e
-export DEPENDENCIES="php-igbinary php-msgpack"
+export DEPENDENCIES="php${PHP_VERSION}-igbinary php${PHP_VERSION}-msgpack"
 export EXTENSION=memcached
 
 # we need to do some weird stuff to get memcached working
-phpdismod igbinary
-phpenmod igbinary
+phpdismod -v $PHP_VERSION igbinary
+phpenmod -v $PHP_VERSION igbinary
 
 ../docker-install.sh
 
-phpdismod igbinary
+phpdismod -v $PHP_VERSION igbinary

extensions/core/mysqli/install.sh

@@ -7,5 +7,5 @@ export PACKAGE_NAME=mysql
 ../docker-install.sh
 
 # Exception for this package that enables both mysqlnd and mysqli and pdo_mysql
-phpdismod mysqli
-phpdismod pdo_mysql
+phpdismod -v $PHP_VERSION mysqli
+phpdismod -v $PHP_VERSION pdo_mysql

extensions/core/redis/install.sh

@@ -4,9 +4,9 @@ set -e
 export EXTENSION=redis
 
 # we need to do some weird stuff to get memcached working
-phpdismod igbinary
-phpenmod igbinary
+phpdismod -v $PHP_VERSION igbinary
+phpenmod -v $PHP_VERSION igbinary
 
 ../docker-install.sh
 
-phpdismod igbinary
+phpdismod -v $PHP_VERSION igbinary

utils/docker-entrypoint-as-root.sh

@@ -120,7 +120,7 @@ sudo chown docker:docker /opt/php_env_var_cache.php
 /usr/bin/real_php /usr/local/bin/check_php_env_var_changes.php &> /dev/null
 
 /usr/bin/real_php /usr/local/bin/generate_conf.php > /etc/php/${PHP_VERSION}/mods-available/generated_conf.ini
-/usr/bin/real_php /usr/local/bin/setup_extensions.php | sudo bash
+PHP_VERSION="${PHP_VERSION}" /usr/bin/real_php /usr/local/bin/setup_extensions.php | sudo bash
 
 # output on the logs can be done by writing on the "tini" PID. Useful for CRONTAB
 TINI_PID=`ps -e | grep tini | awk '{print $1;}'`

utils/php_proxy.sh

@@ -12,7 +12,7 @@ fi
 
 if [[ "$REGENERATE" == "1" ]]; then
   /usr/bin/real_php /usr/local/bin/generate_conf.php | sudo tee "/etc/php/${PHP_VERSION}/mods-available/generated_conf.ini" > /dev/null
-  /usr/bin/real_php /usr/local/bin/setup_extensions.php | sudo bash
+  PHP_VERSION="${PHP_VERSION}" /usr/bin/real_php /usr/local/bin/setup_extensions.php | sudo bash
 fi
 
 exec /usr/bin/real_php "$@"

utils/setup_extensions.php

@@ -15,6 +15,8 @@
 
 $phpExtensions = getPhpExtensionsEnvVar();
 
+$phpVersion = getPhpVersionEnvVar();
+
 //foreach ($compiledExtensions as $phpExtension) {
 //    $envName = 'PHP_EXTENSION_'.strtoupper($phpExtension);
 //
@@ -66,8 +68,8 @@
 }*/
 
 if ($toDisable) {
-    echo 'phpdismod '.implode(' ', $toDisable)."\n";
+    echo 'phpdismod -v ' . $phpVersion . ' ' . implode(' ', $toDisable)."\n";
 }
 if ($toEnable) {
-    echo 'phpenmod '.implode(' ', $toEnable)."\n";
+    echo 'phpenmod -v ' . $phpVersion . ' ' . implode(' ', $toEnable)."\n";
 }

utils/utils.php

@@ -73,6 +73,19 @@ function getPhpExtensionsEnvVar(): array
     return $phpExtensions;
 }
 
+function getPhpVersionEnvVar()
+{
+    static $phpVersion = null;
+    if ($phpVersion !== null) {
+        return $phpVersion;
+    }
+
+    $phpVersion = getenv('PHP_VERSION');
+
+    return $phpVersion;
+}
+
+
 function enableExtension(string $extensionName): bool {
     $phpExtensions = getPhpExtensionsEnvVar();