From defbcc50fd51c7e96e91ec810e3670cfe015ccdc Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 22 Oct 2021 03:51:51 +0000 Subject: [PATCH] 20200729.0.0-debian-10-r396 release --- bitnami/dokuwiki/20200729/debian-10/Dockerfile | 8 ++++---- .../prebuildfs/opt/bitnami/.bitnami_components.json | 8 ++++---- .../debian-10/rootfs/opt/bitnami/scripts/libphp.sh | 1 + .../debian-10/rootfs/opt/bitnami/scripts/php-env.sh | 2 ++ bitnami/dokuwiki/README.md | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/bitnami/dokuwiki/20200729/debian-10/Dockerfile b/bitnami/dokuwiki/20200729/debian-10/Dockerfile index 45716a79eb3e..d648c2aa29e1 100644 --- a/bitnami/dokuwiki/20200729/debian-10/Dockerfile +++ b/bitnami/dokuwiki/20200729/debian-10/Dockerfile @@ -9,24 +9,24 @@ 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 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 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.24-5" --checksum e9c8baef629a858d404b0fe58725650c2f9c282da7735ee6477bd9633c00089c +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.25-0" --checksum a1e8ddaa11e536455db0af843ed8153ba2959c165e662ff4d489537e9b0fa82b RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.51-0" --checksum 71010c86332e4ad0993bc875d103bb916184f1f42884a9098db65c969553c34a -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.24-3" --checksum 534aa93850b658381e8ef85dd9cdb64c097eb7938d733640ac92f65263cb5dec +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.25-0" --checksum 94230b4abfeff6424103c40676c7162330c338b03b4f1a77f07eba709e650e35 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "dokuwiki" "20200729.0.0-2" --checksum ef85bcac977f92a43b14dfa89011f240216a3f27936b9e982e0925c42d2c352c 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/dokuwiki/postunpack.sh ENV APACHE_ENABLE_CUSTOM_PORTS="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="dokuwiki" \ - BITNAMI_IMAGE_VERSION="20200729.0.0-debian-10-r395" \ + BITNAMI_IMAGE_VERSION="20200729.0.0-debian-10-r396" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 715fcbdd4049..09a6ea5b4bba 100644 --- a/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -22,17 +22,17 @@ }, "libphp": { "arch": "amd64", - "digest": "534aa93850b658381e8ef85dd9cdb64c097eb7938d733640ac92f65263cb5dec", + "digest": "94230b4abfeff6424103c40676c7162330c338b03b4f1a77f07eba709e650e35", "distro": "debian-10", "type": "NAMI", - "version": "7.4.24-3" + "version": "7.4.25-0" }, "php": { "arch": "amd64", - "digest": "e9c8baef629a858d404b0fe58725650c2f9c282da7735ee6477bd9633c00089c", + "digest": "a1e8ddaa11e536455db0af843ed8153ba2959c165e662ff4d489537e9b0fa82b", "distro": "debian-10", "type": "NAMI", - "version": "7.4.24-5" + "version": "7.4.25-0" }, "render-template": { "arch": "amd64", diff --git a/bitnami/dokuwiki/20200729/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/dokuwiki/20200729/debian-10/rootfs/opt/bitnami/scripts/libphp.sh index c0a910a20394..a9bd719ef266 100644 --- a/bitnami/dokuwiki/20200729/debian-10/rootfs/opt/bitnami/scripts/libphp.sh +++ b/bitnami/dokuwiki/20200729/debian-10/rootfs/opt/bitnami/scripts/libphp.sh @@ -78,6 +78,7 @@ php_initialize() { php_set_runtime_config() { local -r conf_file="${1:?missing conf file}" + ! is_empty_value "$PHP_DATE_TIMEZONE" && info "Setting PHP date.timezone option" && php_conf_set date.timezone "$PHP_DATE_TIMEZONE" "$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" diff --git a/bitnami/dokuwiki/20200729/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/dokuwiki/20200729/debian-10/rootfs/opt/bitnami/scripts/php-env.sh index d38b3b2e02c9..038af0c8d252 100644 --- a/bitnami/dokuwiki/20200729/debian-10/rootfs/opt/bitnami/scripts/php-env.sh +++ b/bitnami/dokuwiki/20200729/debian-10/rootfs/opt/bitnami/scripts/php-env.sh @@ -22,6 +22,7 @@ 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_DATE_TIMEZONE PHP_ENABLE_OPCACHE PHP_EXPOSE_PHP PHP_MAX_EXECUTION_TIME @@ -72,6 +73,7 @@ export PHP_FPM_DAEMON_USER="daemon" export PHP_FPM_DAEMON_GROUP="daemon" # PHP configuration +export PHP_DATE_TIMEZONE="${PHP_DATE_TIMEZONE:-}" PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-"${PHP_OPCACHE_ENABLED:-}"}" export PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-}" export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-}" diff --git a/bitnami/dokuwiki/README.md b/bitnami/dokuwiki/README.md index 8dffd5b9bfbe..38da71522c81 100644 --- a/bitnami/dokuwiki/README.md +++ b/bitnami/dokuwiki/README.md @@ -35,7 +35,7 @@ Non-root container images add an extra layer of security and are generally recom 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/). -* [`20200729`, `20200729-debian-10`, `20200729.0.0`, `20200729.0.0-debian-10-r395`, `latest` (20200729/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/20200729.0.0-debian-10-r395/20200729/debian-10/Dockerfile) +* [`20200729`, `20200729-debian-10`, `20200729.0.0`, `20200729.0.0-debian-10-r396`, `latest` (20200729/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/20200729.0.0-debian-10-r396/20200729/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/dokuwiki GitHub repo](https://github.com/bitnami/bitnami-docker-dokuwiki).