From 68384d13d34f7fda277201adfa491abb979f296a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 25 Aug 2021 07:02:43 +0000 Subject: [PATCH] 3.42.5-debian-10-r109 release --- bitnami/ghost/3/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libfile.sh | 24 +++++++++++++++++-- .../rootfs/opt/bitnami/scripts/libghost.sh | 2 +- .../opt/bitnami/scripts/libmysqlclient.sh | 2 +- bitnami/ghost/README.md | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/bitnami/ghost/3/debian-10/Dockerfile b/bitnami/ghost/3/debian-10/Dockerfile index dc711cb11d54..0d0e2fe3df43 100644 --- a/bitnami/ghost/3/debian-10/Dockerfile +++ b/bitnami/ghost/3/debian-10/Dockerfile @@ -21,7 +21,7 @@ RUN /opt/bitnami/scripts/ghost/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="ghost" \ - BITNAMI_IMAGE_VERSION="3.42.5-debian-10-r108" \ + BITNAMI_IMAGE_VERSION="3.42.5-debian-10-r109" \ LD_PRELOAD="/opt/bitnami/common/lib/libnss_wrapper.so" \ LNAME="ghost" \ MARIADB_HOST="mariadb" \ diff --git a/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index dd47f25e4e45..41ebaf7464f6 100644 --- a/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -10,7 +10,7 @@ # Functions ######################## -# Replace a regex in a file +# Replace a regex-matching string in a file # Arguments: # $1 - filename # $2 - match regex @@ -30,7 +30,7 @@ replace_in_file() { # We should avoid using 'sed in-place' substitutions # 1) They are not compatible with files mounted from ConfigMap(s) # 2) We found incompatibility issues with Debian10 and "in-place" substitutions - del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues if [[ $posix_regex = true ]]; then result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" else @@ -39,6 +39,26 @@ replace_in_file() { echo "$result" > "$filename" } +######################## +# Replace a regex-matching multiline string in a file +# Arguments: +# $1 - filename +# $2 - match regex +# $3 - substitute regex +# Returns: +# None +######################### +replace_in_file_multiline() { + local filename="${1:?filename is required}" + local match_regex="${2:?match regex is required}" + local substitute_regex="${3:?substitute regex is required}" + + local result + local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")" + echo "$result" > "$filename" +} + ######################## # Remove a line in a file based on a regex # Arguments: diff --git a/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libghost.sh b/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libghost.sh index 0b9abcad23ed..7d4367925cf2 100644 --- a/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libghost.sh +++ b/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libghost.sh @@ -181,7 +181,7 @@ ghost_validate() { # Arguments: # $1 - Variable name # $2 - Value to assign to the variable -# $3 - Whether the value is a literal, or if instead it should be quoted (default: no) +# $3 - YAML type (string, int or bool) # Returns: # None ######################### diff --git a/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh index a0c941c5ac05..524c167367e6 100644 --- a/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -407,7 +407,7 @@ mysql_stop() { local return_value=0 read -r -a db_files <<< "$(find "$DB_DATA_DIR" -regex "^.*ibdata[0-9]+" -print0 -o -regex "^.*ib_logfile[0-9]+" -print0 | xargs -0)" for f in "${db_files[@]}"; do - debug_execute lsof -w "$f" && return_value=1 + debug_execute fuser "$f" && return_value=1 done return $return_value } diff --git a/bitnami/ghost/README.md b/bitnami/ghost/README.md index d857b6265706..eff113afc607 100644 --- a/bitnami/ghost/README.md +++ b/bitnami/ghost/README.md @@ -42,7 +42,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`4`, `4-debian-10`, `4.12.1`, `4.12.1-debian-10-r7`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/4.12.1-debian-10-r7/4/debian-10/Dockerfile) -- [`3`, `3-debian-10`, `3.42.5`, `3.42.5-debian-10-r108` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/3.42.5-debian-10-r108/3/debian-10/Dockerfile) +- [`3`, `3-debian-10`, `3.42.5`, `3.42.5-debian-10-r109` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/3.42.5-debian-10-r109/3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/ghost GitHub repo](https://github.com/bitnami/bitnami-docker-ghost).