diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 4512d5f32617..b3be082f894b 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.13-4" --checksum 51d1e2ef6af75eb5f1b58625e13c0933b053daf835990e427533cbbfd7cfc903 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.13-6" --checksum 0fac508522f3fb5ab40164b73483a654133f478618212eeda141b9e7095f9edb RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-4" --checksum 35f10bccc2a1e55c050c9c483e28ee729e11f873acadd327d7361b53938a0101 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.27-0" --checksum f96905e763a6334b75a7cdb07f8d89658cde02be41cb09d91d0682fc649fdcff RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.13-1" --checksum 90851eaf7bea77d3499ec654e51a6714c09eb3097909338f42ceb878b8fa1ae9 @@ -30,7 +30,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.0.4-debian-10-r78" \ + BITNAMI_IMAGE_VERSION="5.0.4-debian-10-r79" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 3a95c20d19af..90e70969f575 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "php": { "arch": "amd64", - "digest": "51d1e2ef6af75eb5f1b58625e13c0933b053daf835990e427533cbbfd7cfc903", + "digest": "0fac508522f3fb5ab40164b73483a654133f478618212eeda141b9e7095f9edb", "distro": "debian-10", "type": "NAMI", - "version": "7.4.13-4" + "version": "7.4.13-6" }, "phpmyadmin": { "arch": "amd64", 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 1773eeeb1b7b..9b502a7d3ed4 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 @@ -57,13 +57,7 @@ php_conf_set() { php_initialize() { # Configure PHP options based on the runtime environment info "Configuring PHP options" - ! is_empty_value "$PHP_MAX_EXECUTION_TIME" && info "Setting PHP max_execution_time option" && php_conf_set max_execution_time "$PHP_MAX_EXECUTION_TIME" - ! is_empty_value "$PHP_MAX_INPUT_TIME" && info "Setting PHP max_input_time option" && php_conf_set max_input_time "$PHP_MAX_INPUT_TIME" - ! is_empty_value "$PHP_MAX_INPUT_VARS" && info "Setting PHP max_input_vars option" && php_conf_set max_input_vars "$PHP_MAX_INPUT_VARS" - ! is_empty_value "$PHP_MEMORY_LIMIT" && info "Setting PHP memory_limit option" && php_conf_set memory_limit "$PHP_MEMORY_LIMIT" - ! is_empty_value "$PHP_POST_MAX_SIZE" && info "Setting PHP post_max_size option" && php_conf_set post_max_size "$PHP_POST_MAX_SIZE" - ! is_empty_value "$PHP_UPLOAD_MAX_FILESIZE" && info "Setting PHP upload_max_filesize option" && php_conf_set upload_max_filesize "$PHP_UPLOAD_MAX_FILESIZE" - is_yes_no_value "$PHP_EXPOSE_PHP" && info "Setting PHP expose_php option" && php_conf_set expose_php "$(php_convert_to_boolean "$PHP_EXPOSE_PHP")" + php_set_runtime_config "$PHP_CONF_FILE" # PHP-FPM configuration ! is_empty_value "$PHP_FPM_LISTEN_ADDRESS" && info "Setting PHP-FPM listen option" && php_conf_set "listen" "$PHP_FPM_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm.d/www.conf" @@ -72,6 +66,29 @@ php_initialize() { true } +######################## +# Set PHP runtime options, based on user-provided environment variables +# Globals: +# PHP_* +# Arguments: +# None +# Returns: +# None +######################### +php_set_runtime_config() { + local -r conf_file="${1:?missing 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 +} + ######################## # Convert a yes/no value to a PHP boolean # Globals: 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 7b974fab2511..9ff4e1d53912 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 @@ -69,6 +69,6 @@ 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:-yes}" +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 74b2273582ef..d262c28b7a7c 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.0.4`, `5.0.4-debian-10-r78`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.4-debian-10-r78/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.0.4`, `5.0.4-debian-10-r79`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.4-debian-10-r79/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin). @@ -191,7 +191,7 @@ The phpMyAdmin instance can be customized by specifying environment variables on - `PHP_MEMORY_LIMIT`: Memory limit for PHP scripts. Default: **256M** - `PHP_POST_MAX_SIZE`: Maximum size for PHP POST requests. Default: **80M** - `PHP_UPLOAD_MAX_FILESIZE`: Maximum file size for PHP upload. Default: **80M** -- `PHP_EXPOSE_PHP`: Enables HTTP header with PHP version. Default: **yes** +- `PHP_EXPOSE_PHP`: Enables HTTP header with PHP version. No default. ### Specifying Environment variables using Docker Compose