From b55a03d5f58eb03fbb9c27fa0b2847fcb1cdaf6d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 8 Jul 2021 06:37:34 +0000 Subject: [PATCH] 5.7.2-debian-10-r36 release --- bitnami/wordpress/5/debian-10/Dockerfile | 6 +-- .../opt/bitnami/.bitnami_components.json | 4 +- .../prebuildfs/opt/bitnami/scripts/libfile.sh | 39 +++++++++++++++++++ bitnami/wordpress/README.md | 2 +- 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/bitnami/wordpress/5/debian-10/Dockerfile b/bitnami/wordpress/5/debian-10/Dockerfile index 54c5d80be056..4d075c4d36df 100644 --- a/bitnami/wordpress/5/debian-10/Dockerfile +++ b/bitnami/wordpress/5/debian-10/Dockerfile @@ -10,7 +10,7 @@ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip less 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 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.21-0" --checksum cd407e914d11706babacc6a95070cbe96f41f0cef11e879e0d14b666d8be5e64 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-0" --checksum 85aa9ec2b419b3e53b5aa8f8e52bb35cddba3a646f204dfaec029e292d250017 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-1" --checksum 0296bc7dd5f621eba6f948433a6c7fc04a45876f42f6395cea5888b707f1ad11 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wp-cli" "2.5.0-0" --checksum b2be17e2065fc8d9d1a175e1dbc689e8f6a5543bb3b6a6f5470bc987b7c396ce RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.30-0" --checksum 47107f86621bb184307e47bbb15244d076575f0e0f7d339f198ef312b6f3f285 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.21-0" --checksum 292d68cbb7fdb64f5a99d9f8221f4c584083f972f6ab986ed0dc6dced6b43a65 @@ -21,8 +21,8 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/mysql-client/postunpack.sh -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/wordpress/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ @@ -30,7 +30,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="wordpress" \ - BITNAMI_IMAGE_VERSION="5.7.2-debian-10-r35" \ + BITNAMI_IMAGE_VERSION="5.7.2-debian-10-r36" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 3e10fa047c9e..7769d0456b64 100644 --- a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,10 @@ { "apache": { "arch": "amd64", - "digest": "85aa9ec2b419b3e53b5aa8f8e52bb35cddba3a646f204dfaec029e292d250017", + "digest": "0296bc7dd5f621eba6f948433a6c7fc04a45876f42f6395cea5888b707f1ad11", "distro": "debian-10", "type": "NAMI", - "version": "2.4.48-0" + "version": "2.4.48-1" }, "gosu": { "arch": "amd64", diff --git a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index b09575cbe4a6..dd47f25e4e45 100644 --- a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -2,6 +2,11 @@ # # Library for managing files +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/libos.sh + # Functions ######################## @@ -78,3 +83,37 @@ append_file_after_last_match() { result="$(tac "$file" | sed -E "0,/($match_regex)/s||${value}\n\1|" | tac)" echo "$result" > "$file" } + +######################## +# Wait until certain entry is present in a log file +# Arguments: +# $1 - entry to look for +# $2 - log file +# $3 - max retries. Default: 12 +# $4 - sleep between retries (in seconds). Default: 5 +# Returns: +# Boolean +######################### +wait_for_log_entry() { + local -r entry="${1:-missing entry}" + local -r log_file="${2:-missing log file}" + local -r retries="${3:-12}" + local -r interval_time="${4:-5}" + local attempt=0 + + check_log_file_for_entry() { + if ! grep -qE "$entry" "$log_file"; then + debug "Entry \"${entry}\" still not present in ${log_file} (attempt $((++attempt))/${retries})" + return 1 + fi + } + debug "Checking that ${log_file} log file contains entry \"${entry}\"" + if retry_while check_log_file_for_entry "$retries" "$interval_time"; then + debug "Found entry \"${entry}\" in ${log_file}" + true + else + error "Could not find entry \"${entry}\" in ${log_file} after ${retries} retries" + debug_execute cat "$log_file" + return 1 + fi +} diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md index 8b07cf93baed..d21712da9b20 100644 --- a/bitnami/wordpress/README.md +++ b/bitnami/wordpress/README.md @@ -41,7 +41,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/). -- [`5`, `5-debian-10`, `5.7.2`, `5.7.2-debian-10-r35`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.7.2-debian-10-r35/5/debian-10/Dockerfile) +- [`5`, `5-debian-10`, `5.7.2`, `5.7.2-debian-10-r36`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.7.2-debian-10-r36/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).