diff --git a/bitnami/solr/8/debian-10/Dockerfile b/bitnami/solr/8/debian-10/Dockerfile index 4c49a2498527..0d97f00901a5 100644 --- a/bitnami/solr/8/debian-10/Dockerfile +++ b/bitnami/solr/8/debian-10/Dockerfile @@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/solr/postunpack.sh ENV BITNAMI_APP_NAME="solr" \ - BITNAMI_IMAGE_VERSION="8.9.0-debian-10-r56" \ + BITNAMI_IMAGE_VERSION="8.9.0-debian-10-r57" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/solr/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 8983 diff --git a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index dd47f25e4e45..41ebaf7464f6 100644 --- a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/solr/8/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/solr/README.md b/bitnami/solr/README.md index 4207158e46e5..63ca1631cd11 100644 --- a/bitnami/solr/README.md +++ b/bitnami/solr/README.md @@ -36,7 +36,7 @@ You can find the available configuration options in the [Environment Variables]( 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/). -* [`8`, `8-debian-10`, `8.9.0`, `8.9.0-debian-10-r56`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.9.0-debian-10-r56/8/debian-10/Dockerfile) +* [`8`, `8-debian-10`, `8.9.0`, `8.9.0-debian-10-r57`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.9.0-debian-10-r57/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/solr GitHub repo](https://github.com/bitnami/bitnami-docker-solr).