Merge #324 - Add expose_php env back

It was broken in #320 implementation

Author: williamdes

Dockerfile-alpine.template

@@ -38,9 +38,9 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+ENV MAX_EXECUTION_TIME 600
 ENV MEMORY_LIMIT 512M
 ENV UPLOAD_LIMIT 2048K
-ENV MAX_EXECUTION_TIME 600
 RUN set -ex; \
     \
     { \
@@ -58,7 +58,6 @@ RUN set -ex; \
     \
     { \
         echo 'allow_url_fopen=Off'; \
-        echo 'expose_php=Off'; \
         echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
         echo 'max_input_vars=10000'; \
         echo 'memory_limit=${MEMORY_LIMIT}'; \

Dockerfile-debian.template

@@ -40,9 +40,9 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+ENV MAX_EXECUTION_TIME 600
 ENV MEMORY_LIMIT 512M
 ENV UPLOAD_LIMIT 2048K
-ENV MAX_EXECUTION_TIME 600
 RUN set -ex; \
     \
     { \
@@ -60,7 +60,6 @@ RUN set -ex; \
     \
     { \
         echo 'allow_url_fopen=Off'; \
-        echo 'expose_php=Off'; \
         echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
         echo 'max_input_vars=10000'; \
         echo 'memory_limit=${MEMORY_LIMIT}'; \

apache/Dockerfile

@@ -40,9 +40,9 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+ENV MAX_EXECUTION_TIME 600
 ENV MEMORY_LIMIT 512M
 ENV UPLOAD_LIMIT 2048K
-ENV MAX_EXECUTION_TIME 600
 RUN set -ex; \
     \
     { \
@@ -60,7 +60,6 @@ RUN set -ex; \
     \
     { \
         echo 'allow_url_fopen=Off'; \
-        echo 'expose_php=Off'; \
         echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
         echo 'max_input_vars=10000'; \
         echo 'memory_limit=${MEMORY_LIMIT}'; \

apache/docker-entrypoint.sh

@@ -13,6 +13,11 @@ EOT
     fi
 fi
 
+if [ ! -z "${HIDE_PHP_VERSION}" ]; then
+    echo "PHP version is now hidden."
+    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
+fi
+
 if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
     echo "Adding the custom config.inc.php from base64."
     echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php

docker-entrypoint.sh

@@ -13,6 +13,11 @@ EOT
     fi
 fi
 
+if [ ! -z "${HIDE_PHP_VERSION}" ]; then
+    echo "PHP version is now hidden."
+    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
+fi
+
 if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
     echo "Adding the custom config.inc.php from base64."
     echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php

fpm-alpine/Dockerfile

@@ -38,9 +38,9 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+ENV MAX_EXECUTION_TIME 600
 ENV MEMORY_LIMIT 512M
 ENV UPLOAD_LIMIT 2048K
-ENV MAX_EXECUTION_TIME 600
 RUN set -ex; \
     \
     { \
@@ -58,7 +58,6 @@ RUN set -ex; \
     \
     { \
         echo 'allow_url_fopen=Off'; \
-        echo 'expose_php=Off'; \
         echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
         echo 'max_input_vars=10000'; \
         echo 'memory_limit=${MEMORY_LIMIT}'; \

fpm-alpine/docker-entrypoint.sh

@@ -13,6 +13,11 @@ EOT
     fi
 fi
 
+if [ ! -z "${HIDE_PHP_VERSION}" ]; then
+    echo "PHP version is now hidden."
+    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
+fi
+
 if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
     echo "Adding the custom config.inc.php from base64."
     echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php

fpm/Dockerfile

@@ -40,9 +40,9 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+ENV MAX_EXECUTION_TIME 600
 ENV MEMORY_LIMIT 512M
 ENV UPLOAD_LIMIT 2048K
-ENV MAX_EXECUTION_TIME 600
 RUN set -ex; \
     \
     { \
@@ -60,7 +60,6 @@ RUN set -ex; \
     \
     { \
         echo 'allow_url_fopen=Off'; \
-        echo 'expose_php=Off'; \
         echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
         echo 'max_input_vars=10000'; \
         echo 'memory_limit=${MEMORY_LIMIT}'; \

fpm/docker-entrypoint.sh

@@ -13,6 +13,11 @@ EOT
     fi
 fi
 
+if [ ! -z "${HIDE_PHP_VERSION}" ]; then
+    echo "PHP version is now hidden."
+    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
+fi
+
 if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
     echo "Adding the custom config.inc.php from base64."
     echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php