diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 57b7dd853d56..d5e5b52d55d2 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" RUN chmod g+rwX /opt/bitnami COPY rootfs / -RUN /opt/bitnami/scripts/apache/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh +RUN /opt/bitnami/scripts/apache/postunpack.sh RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/phpmyadmin/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ @@ -28,7 +28,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r33" \ + BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r35" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh index 9b502a7d3ed4..c0a910a20394 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh @@ -78,13 +78,14 @@ php_initialize() { php_set_runtime_config() { local -r conf_file="${1:?missing conf file}" + ! is_empty_value "$PHP_ENABLE_OPCACHE" && info "Setting PHP opcache.enable option" && php_conf_set opcache.enable "$PHP_ENABLE_OPCACHE" "$conf_file" + ! is_empty_value "$PHP_EXPOSE_PHP" && info "Setting PHP expose_php option" && php_conf_set expose_php "$PHP_EXPOSE_PHP" "$conf_file" ! is_empty_value "$PHP_MAX_EXECUTION_TIME" && info "Setting PHP max_execution_time option" && php_conf_set max_execution_time "$PHP_MAX_EXECUTION_TIME" "$conf_file" ! is_empty_value "$PHP_MAX_INPUT_TIME" && info "Setting PHP max_input_time option" && php_conf_set max_input_time "$PHP_MAX_INPUT_TIME" "$conf_file" ! is_empty_value "$PHP_MAX_INPUT_VARS" && info "Setting PHP max_input_vars option" && php_conf_set max_input_vars "$PHP_MAX_INPUT_VARS" "$conf_file" ! is_empty_value "$PHP_MEMORY_LIMIT" && info "Setting PHP memory_limit option" && php_conf_set memory_limit "$PHP_MEMORY_LIMIT" "$conf_file" ! is_empty_value "$PHP_POST_MAX_SIZE" && info "Setting PHP post_max_size option" && php_conf_set post_max_size "$PHP_POST_MAX_SIZE" "$conf_file" ! is_empty_value "$PHP_UPLOAD_MAX_FILESIZE" && info "Setting PHP upload_max_filesize option" && php_conf_set upload_max_filesize "$PHP_UPLOAD_MAX_FILESIZE" "$conf_file" - ! is_empty_value "$PHP_EXPOSE_PHP" && info "Setting PHP expose_php option" && php_conf_set expose_php "$PHP_EXPOSE_PHP" "$conf_file" true } diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh index bfa1c683afc8..d38b3b2e02c9 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh @@ -22,13 +22,15 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" # variable will be overridden with the value specified in that file php_env_vars=( PHP_FPM_LISTEN_ADDRESS + PHP_ENABLE_OPCACHE + PHP_EXPOSE_PHP PHP_MAX_EXECUTION_TIME PHP_MAX_INPUT_TIME PHP_MAX_INPUT_VARS PHP_MEMORY_LIMIT PHP_POST_MAX_SIZE PHP_UPLOAD_MAX_FILESIZE - PHP_EXPOSE_PHP + PHP_OPCACHE_ENABLED ) for env_var in "${php_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -70,12 +72,14 @@ export PHP_FPM_DAEMON_USER="daemon" export PHP_FPM_DAEMON_GROUP="daemon" # PHP configuration +PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-"${PHP_OPCACHE_ENABLED:-}"}" +export PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-}" +export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-}" export PHP_MAX_EXECUTION_TIME="${PHP_MAX_EXECUTION_TIME:-}" export PHP_MAX_INPUT_TIME="${PHP_MAX_INPUT_TIME:-}" export PHP_MAX_INPUT_VARS="${PHP_MAX_INPUT_VARS:-}" export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-}" export PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-}" export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}" -export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-}" # Custom environment variables may be defined below diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index a99c6d7d1179..e7b63a7fe8cf 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`5`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r33`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r33/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r35`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r35/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin). @@ -186,6 +186,7 @@ The phpMyAdmin instance can be customized by specifying environment variables on ### PHP configuration +- `PHP_ENABLE_OPCACHE`: Enable OPcache for PHP scripts. No default. - `PHP_EXPOSE_PHP`: Enables HTTP header with PHP version. No default. - `PHP_MAX_EXECUTION_TIME`: Maximum execution time for PHP scripts. No default. - `PHP_MAX_INPUT_TIME`: Maximum input time for PHP scripts. No default.